sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

library_flags: Leave setting of CPPPATH to waf too.

Browse Source
This commit is contained in:
Jelmer Vernooij 2012-02-19 02:16:14 +01:00
parent a977de9fdf
commit ab454403eb
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildtools/wafsamba/samba_autoconf.py
View File

@ -468,10 +468,7 @@ def library_flags(self, libs):
ccflags = []
ldflags = []
for lib in TO_LIST(libs):
inc_path = getattr(self.env, 'CPPPATH_%s' % lib.upper(), [])
lib_path = getattr(self.env, 'LIBPATH_%s' % lib.upper(), [])
ccflags.extend(['-I%s' % i for i in inc_path])
# note that we do not add the -L in here, as that is added by the waf
# note that we do not add the -I and -L in here, as that is added by the waf
# core. Adding it here would just change the order that it is put on the link line
# which can cause system paths to be added before internal libraries
extra_ccflags = TO_LIST(getattr(self.env, 'CCFLAGS_%s' % lib.upper(), []))