merge with master, with minor conflict fixes

1 files changed, 4 insertions, 5 deletions

diff --git a/wscript b/wscript
index ba3cfadac1..440ba088c0 100644
--- a/wscript
+++ b/wscript
@@ -168,11 +168,6 @@ def set_compiler_flags (conf,opt):
     if opt.gprofile:
         debug_flags = [ '-pg' ]
 
-    if opt.backtrace:
-        if opt.dist_target == 'auto':
-            if platform != 'darwin' and not is_clang:
-                debug_flags = [ '-rdynamic' ]
-
     # Autodetect
     if opt.dist_target == 'auto':
         if platform == 'darwin':
@@ -409,6 +404,10 @@ def set_compiler_flags (conf,opt):
         conf.env.append_value('CFLAGS', optimization_flags)
         conf.env.append_value('CXXFLAGS', optimization_flags)
 
+    if opt.backtrace:
+        if platform != 'darwin' and not is_clang:
+            linker_flags += [ '-rdynamic' ]
+
     conf.env.append_value('CFLAGS', compiler_flags)
     conf.env.append_value('CFLAGS', c_flags)
     conf.env.append_value('CXXFLAGS', compiler_flags)