bug 1525 Linker error with mpi on Mac 10.8
authorBrian Swenson <bswenson3@gatech.edu>
Fri, 07 Dec 2012 10:19:29 -0500
changeset 9173 513f8ec65729
parent 9172 2d6235af7a36
child 9174 bb6bbda68e97
bug 1525 Linker error with mpi on Mac 10.8
RELEASE_NOTES
src/mpi/wscript
src/wscript
--- a/RELEASE_NOTES	Fri Dec 07 11:12:43 2012 +0100
+++ b/RELEASE_NOTES	Fri Dec 07 10:19:29 2012 -0500
@@ -41,6 +41,7 @@
  - 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
 ------------
--- a/src/mpi/wscript	Fri Dec 07 11:12:43 2012 +0100
+++ b/src/mpi/wscript	Fri Dec 07 10:19:29 2012 -0500
@@ -22,7 +22,7 @@
             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')
--- a/src/wscript	Fri Dec 07 11:12:43 2012 +0100
+++ b/src/wscript	Fri Dec 07 10:19:29 2012 -0500
@@ -58,7 +58,7 @@
     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]