Backed out changeset 4d9d3ff807a9
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Wed, 22 Apr 2009 13:59:10 +0200
changeset 4394 dced016d5f49
parent 4393 4d9d3ff807a9
child 4395 489abe44ed7e
Backed out changeset 4d9d3ff807a9 Does not work on x86-64.
bindings/python/wscript
wscript
--- a/bindings/python/wscript	Wed Apr 22 13:06:22 2009 +0200
+++ b/bindings/python/wscript	Wed Apr 22 13:59:10 2009 +0200
@@ -445,10 +445,6 @@
         pymod.target = 'ns3/_ns3'
         pymod.name = 'ns3module'
         pymod.uselib_local = "ns3"
-        if pymod.env['ENABLE_STATIC_NS3']:
-            pymod.env.append_value('LINKFLAGS', '-Wl,--whole-archive,-Bstatic')
-            pymod.env.append_value('LINKFLAGS', '-lns3')
-            pymod.env.append_value('LINKFLAGS', '-Wl,-Bdynamic,--no-whole-archive')
 
         defines = list(pymod.env['CXXDEFINES'])
         defines.extend(['NS_DEPRECATED=', 'NS3_DEPRECATED_H'])
--- a/wscript	Wed Apr 22 13:06:22 2009 +0200
+++ b/wscript	Wed Apr 22 13:59:10 2009 +0200
@@ -291,6 +291,7 @@
     conf.find_program('valgrind', var='VALGRIND')
 
     if Options.options.enable_static and \
+            not conf.env['ENABLE_PYTHON_BINDINGS'] and \
             env['PLATFORM'].startswith('linux'):
         conf.env['ENABLE_STATIC_NS3'] = Options.options.enable_static