diff options
| author | Robin Gareus <robin@gareus.org> | 2017-02-19 16:01:25 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-02-19 16:01:25 +0100 |
| commit | 0653766f790fc17afe323e616c10bcc21efe4915 (patch) | |
| tree | 007a06db66c8ca087fd6127f7cdf8d0aeff3b1de | |
| parent | 05149f9bc54d0cfb8b162ba7cfac975b5eb79971 (diff) | |
Allow to keep environment C/XXFLAGS with debug builds
this is needed for e.g. windows debug builds to pass mstackrealign
| -rwxr-xr-x | tools/x-win/compile.sh | 1 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/x-win/compile.sh b/tools/x-win/compile.sh index f21aec19b1..58350f9e62 100755 --- a/tools/x-win/compile.sh +++ b/tools/x-win/compile.sh @@ -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 \ @@ -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'] = [] |