[llvm-commits] [test-suite] r107519 - /test-suite/trunk/Makefile.rules

[Bob Wilson]

Author: bwilson
Date: Fri Jul  2 16:29:29 2010
New Revision: 107519

URL: http://llvm.org/viewvc/llvm-project?rev=107519&view=rev
Log:
Set CONFIGURATION variable to match the BuildMode variable in llvm's top-level
Makefile.rules.  It was inconsistent for "Release+Debug" builds.

Modified:
    test-suite/trunk/Makefile.rules

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=107519&r1=107518&r2=107519&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Fri Jul  2 16:29:29 2010
@@ -137,13 +137,19 @@
 
 ifeq ($(ENABLE_PROFILING),1)
   ENABLE_OPTIMIZED = 1
-  CONFIGURATION := Profile
-else
-  ifeq ($(ENABLE_OPTIMIZED),1)
-    CONFIGURATION := Release
-  else
-    CONFIGURATION := Debug
+endif
+
+ifeq ($(ENABLE_OPTIMIZED),1)
+  CONFIGURATION := Release
+  ifdef DEBUG_SYMBOLS
+    CONFIGURATION := $(CONFIGURATION)+Debug
   endif
+else
+  CONFIGURATION := Debug
+endif
+
+ifeq ($(ENABLE_PROFILING),1)
+  CONFIGURATION := $(CONFIGURATION)+Profile
 endif
 
 # If ENABLE_ASSERTIONS=1 is specified (make command line or configured),