From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 11 Jul 2011 14:36:40 +0000 (+0100)
Subject: scons: Filter-out NDEBUG define from llvm-config.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=acf82194ce4383308d1e8939d1778594bf5547c5;p=mesa.git

scons: Filter-out NDEBUG define from llvm-config.

Based on a similar autoconf change from Marek.
---

diff --git a/scons/llvm.py b/scons/llvm.py
index b89899bbf87..66f972df5fb 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: