View | Details | Raw Unified | Return to bug 1525
Collapse All | Expand All

(-)a/src/mpi/wscript (-1 / +1 lines)
 Lines 22-28    Link Here 
22 
            conf.env['ENABLE_MPI'] = True
 22 
            conf.env['ENABLE_MPI'] = True
23 
            for libpath in conf.env.LIBPATH_MPI:
 23 
            for libpath in conf.env.LIBPATH_MPI:
24 
                if 'mpi' in libpath:
 24 
                if 'mpi' in libpath:
25 
                    conf.env.append_value('LINKFLAGS_MPI', '-Wl,-rpath='+libpath)
 25 
                    conf.env.append_value('LINKFLAGS_MPI', '-Wl,-rpath,'+libpath)
26 
            conf.report_optional_feature("mpi", "MPI Support", True, '')
26 
            conf.report_optional_feature("mpi", "MPI Support", True, '')
27 
        else:
 27 
        else:
28 
            conf.report_optional_feature("mpi", "MPI Support", False, 'mpic++ not found')
 28 
            conf.report_optional_feature("mpi", "MPI Support", False, 'mpic++ not found')
(-)a/src/wscript (-1 / +1 lines)
 Lines 58-64    Link Here 
58 
    blddir = os.path.abspath(os.path.join(conf.bldnode.abspath(), conf.variant))
 58 
    blddir = os.path.abspath(os.path.join(conf.bldnode.abspath(), conf.variant))
59 
    conf.env.append_value('NS3_MODULE_PATH', blddir)
 59 
    conf.env.append_value('NS3_MODULE_PATH', blddir)
60 
    if Options.options.enable_rpath:
 60 
    if Options.options.enable_rpath:
61 
        conf.env.append_value('RPATH', '-Wl,-rpath=%s' % (os.path.join(blddir),))
 61 
        conf.env.append_value('RPATH', '-Wl,-rpath,%s' % (os.path.join(blddir),))
62 

          62
          

        

        

          63
          
    ## Used to link the 'test-runner' program with all of ns-3 code

          63
          
    ## Used to link the 'test-runner' program with all of ns-3 code

        

        

          64
          
    conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_modules]

          64
          
    conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_modules]

        






  

  Return to bug 1525