From 7eda961b1f0a84ce8ad175329a04982adce6399b Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 22 Apr 2009 13:59:10 +0200 Subject: [PATCH] Backed out changeset 4d9d3ff807a9 Does not work on x86-64. --- bindings/python/wscript | 4 ---- wscript | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bindings/python/wscript b/bindings/python/wscript index 6d39fe62d..d33fdf381 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -445,10 +445,6 @@ def build(bld): 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']) diff --git a/wscript b/wscript index fdcc6e1bf..1be89ff62 100644 --- a/wscript +++ b/wscript @@ -291,6 +291,7 @@ def configure(conf): 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