summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-02-19 16:01:25 +0100
committerRobin Gareus <robin@gareus.org>2017-02-19 16:01:25 +0100
commit0653766f790fc17afe323e616c10bcc21efe4915 (patch)
tree007a06db66c8ca087fd6127f7cdf8d0aeff3b1de /wscript
parent05149f9bc54d0cfb8b162ba7cfac975b5eb79971 (diff)
Allow to keep environment C/XXFLAGS with debug builds
this is needed for e.g. windows debug builds to pass mstackrealign
Diffstat (limited to 'wscript')
-rw-r--r--wscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/wscript b/wscript
index c2dcfd80f3..9222b98d17 100644
--- a/wscript
+++ b/wscript
@@ -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'] = []