diff options
| -rw-r--r-- | pylibfdt/Makefile.pylibfdt | 2 | ||||
| -rwxr-xr-x | pylibfdt/setup.py | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/pylibfdt/Makefile.pylibfdt b/pylibfdt/Makefile.pylibfdt index 6b34b01..3c6ae44 100644 --- a/pylibfdt/Makefile.pylibfdt +++ b/pylibfdt/Makefile.pylibfdt @@ -5,7 +5,7 @@ PYLIBFDT_srcs = $(PYLIBFDT_srcdir)/libfdt.i PYMODULE = $(PYLIBFDT_objdir)/_libfdt.so define run_setup - CPPFLAGS="$(CPPFLAGS)" VERSION="$(dtc_version)" + VERSION="$(dtc_version)" $(PYLIBFDT_objdir)/setup.py --quiet $(1) endef diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py index aafe70d..95f1601 100755 --- a/pylibfdt/setup.py +++ b/pylibfdt/setup.py @@ -5,7 +5,6 @@ setup.py file for SWIG libfdt Copyright (C) 2017 Google, Inc. Written by Simon Glass <sjg@chromium.org> -C flags to use are provided in CPPFLAGS Version is provided in VERSION If these variables are not given they are parsed from the Makefiles. This @@ -75,26 +74,24 @@ def GetEnvFromMakefiles(): makevars = ParseMakefile(os.path.join(basedir, 'Makefile')) version = '%s.%s.%s' % (makevars['VERSION'], makevars['PATCHLEVEL'], makevars['SUBLEVEL']) - cflags = ['-I%s/libfdt' % basedir] - return version, cflags + return version progname = sys.argv[0] -cflags = os.environ.get('CPPFLAGS', '').split() version = os.environ.get('VERSION') # If we were called directly rather than through our Makefile (which is often # the case with Python module installation), read the settings from the # Makefile. -if not all((version, cflags)): - version, cflags= GetEnvFromMakefiles() +if not version: + version = GetEnvFromMakefiles() libfdt_module = Extension( '_libfdt', sources = ['pylibfdt/libfdt.i'], + include_dirs = ['libfdt'], libraries = ['fdt'], library_dirs = ['libfdt'], - extra_compile_args = cflags, ) setup( |