SunnyQjm/ns-3-dev
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Fix waf-tools/boost.py

Browse Source 
The defined logic sets STLIBPATH_BOOST variable even if static boost
libraries have not been requested.  Having this variable set,
potentially prefers linking to pre-installed libns3-dev... libraries,
instead of the compiled libraries.
This commit is contained in:
Alexander Afanasyev
2015-08-21 00:51:12 -07:00
parent cb9702a556
commit 4da74c6430
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
waf-tools/boost.py
+6 -4
View File
@@ -327,10 +327,12 @@ def check_boost(self, *k, **kw):
Logs.warn('boost: static parameter is deprecated, use stlib instead.')
self.start_msg('Checking boost libs')
path, libs, stlibs = self.boost_get_libs(**params)
self.env['LIBPATH_%s' % var] = [path]
self.env['STLIBPATH_%s' % var] = [path]
self.env['LIB_%s' % var] = libs
self.env['STLIB_%s' % var] = stlibs
if libs:
self.env['LIBPATH_%s' % var] = [path]
self.env['LIB_%s' % var] = libs
if stlibs:
self.env['STLIBPATH_%s' % var] = [path]
self.env['STLIB_%s' % var] = stlibs
self.end_msg('ok')
if Logs.verbose:
Logs.pprint('CYAN', ' path : %s' % path)