Module: Mesa Branch: master Commit: acf82194ce4383308d1e8939d1778594bf5547c5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=acf82194ce4383308d1e8939d1778594bf5547c5
Author: José Fonseca <[email protected]> Date: Mon Jul 11 15:36:40 2011 +0100 scons: Filter-out NDEBUG define from llvm-config. Based on a similar autoconf change from Marek. --- scons/llvm.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/scons/llvm.py b/scons/llvm.py index b89899b..66f972d 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -141,7 +141,15 @@ def generate(env): llvm_version = distutils.version.LooseVersion(llvm_version) try: - env.ParseConfig('llvm-config --cppflags') + # Treat --cppflags specially to prevent NDEBUG from disabling + # assertion failures in debug builds. + cppflags = env.ParseFlags('!llvm-config --cppflags') + try: + cppflags['CPPDEFINES'].remove('NDEBUG') + except ValueError: + pass + env.MergeFlags(cppflags) + env.ParseConfig('llvm-config --libs') env.ParseConfig('llvm-config --ldflags') except OSError: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
