From d529904292963b944fa840568b8fec6b4709c465 Mon Sep 17 00:00:00 2001 From: Brian Swenson Date: Fri, 7 Dec 2012 10:19:29 -0500 Subject: [PATCH] bug 1525 Linker error with mpi on Mac 10.8 --- RELEASE_NOTES | 1 + src/mpi/wscript | 2 +- src/wscript | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index a683b676f..785378b34 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -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 ------------ diff --git a/src/mpi/wscript b/src/mpi/wscript index 11aabfb01..d3b2edcd2 100644 --- a/src/mpi/wscript +++ b/src/mpi/wscript @@ -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') diff --git a/src/wscript b/src/wscript index 655d217f0..d9b567775 100644 --- a/src/wscript +++ b/src/wscript @@ -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]