bug 1525 Linker error with mpi on Mac 10.8

This commit is contained in:
Brian Swenson
2012-12-07 10:19:29 -05:00
parent 0a40f05fae
commit d529904292
3 changed files with 3 additions and 2 deletions

View File

@@ -41,6 +41,7 @@ Bugs fixed
- bug 1509 - rttEstimator returns invalid value in presence of errors
- bug 1532 - unimplemented LTE Scheduler methods
- bug 1524 - Fragmentation Threshold equals to Packet Size at MAC Layer (Data + IP + UDP) crash the reception
- bug 1525 - Linker error with mpi on Mac 10.8
Known issues
------------

View File

@@ -22,7 +22,7 @@ def configure(conf):
conf.env['ENABLE_MPI'] = True
for libpath in conf.env.LIBPATH_MPI:
if 'mpi' in libpath:
conf.env.append_value('LINKFLAGS_MPI', '-Wl,-rpath='+libpath)
conf.env.append_value('LINKFLAGS_MPI', '-Wl,-rpath,'+libpath)
conf.report_optional_feature("mpi", "MPI Support", True, '')
else:
conf.report_optional_feature("mpi", "MPI Support", False, 'mpic++ not found')

View File

@@ -58,7 +58,7 @@ def configure(conf):
blddir = os.path.abspath(os.path.join(conf.bldnode.abspath(), conf.variant))
conf.env.append_value('NS3_MODULE_PATH', blddir)
if Options.options.enable_rpath:
conf.env.append_value('RPATH', '-Wl,-rpath=%s' % (os.path.join(blddir),))
conf.env.append_value('RPATH', '-Wl,-rpath,%s' % (os.path.join(blddir),))
## Used to link the 'test-runner' program with all of ns-3 code
conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_modules]