diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-02-19 02:16:14 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-02-19 02:16:14 +0100 |
| commit | ab454403ebc3dbd16c494063a0513df99f58a26b (patch) | |
| tree | 363a1846b20fa130966b8572be9459d0c8c8fd62 /buildtools | |
| parent | a977de9fdfc2cad9724fd46995258a17f05d5b73 (diff) | |
| download | samba-ab454403ebc3dbd16c494063a0513df99f58a26b.tar.gz | |
library_flags: Leave setting of CPPPATH to waf too.
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 6ed719a80a..de94a1cc98 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -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(), [])) |