allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

merge with master, with minor conflict fixes

Browse Source
This commit is contained in:
Paul Davis
2014-02-07 19:00:44 -05:00
parent 89d5be353a d47fe167e3
commit 2a7ed69c28
10 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wscript
View File

@@ -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)