ardour/livetrax
13
0
Fork 0
Code

Allow to keep environment C/XXFLAGS with debug builds

Browse Source 
this is needed for e.g. windows debug builds to pass mstackrealign
This commit is contained in:
Robin Gareus 2017-02-19 16:01:25 +01:00
parent 05149f9bc5
commit 0653766f79
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/x-win/compile.sh
View File

@ -67,6 +67,7 @@ export DLLTOOL=${XPREFIX}-dlltool
CFLAGS="-mstackrealign" \
CXXFLAGS="-mstackrealign" \
LDFLAGS="-L${PREFIX}/lib" ./waf configure \
--keepflags \
--dist-target=mingw \
--also-include=${PREFIX}/include \
$ARDOURCFG \

4
wscript
View File

@ -716,6 +716,8 @@ def options(opt):
help='Build internal libs as static libraries')
opt.add_option('--use-external-libs', action='store_true', default=False, dest='use_external_libs',
help='Use external/system versions of some bundled libraries')
opt.add_option('--keepflags', action='store_true', default=False, dest='keepflags',
help='Do not ignore CFLAGS/CXXFLAGS environment vars')
opt.add_option('--luadoc', action='store_true', default=False, dest='luadoc',
help='Compile Tool to dump LuaBindings (needs C++11)')
opt.add_option('--canvasui', action='store_true', default=False, dest='canvasui',
@ -808,7 +810,7 @@ def configure(conf):
conf.env['MSVC_TARGETS'] = ['x64']
conf.load('msvc')
if Options.options.debug:
if Options.options.debug and not Options.options.keepflags:
# Nuke user CFLAGS/CXXFLAGS if debug is set (they likely contain -O3, NDEBUG, etc)
conf.env['CFLAGS'] = []
conf.env['CXXFLAGS'] = []