[llvm-commits] CVS: llvm-test/Makefile.rules

[Reid Spencer]

Changes in directory llvm-test:

Makefile.rules updated: 1.9 -> 1.10
---
Log message:

Make sure the CONFIGURATION variable is set correctly in light of changes
in LLVM's Makefile.rules. Basically when Assertion checking is on, it 
needs to be set to Release+Asserts, or when off to Debug-Asserts, as is the
case for LLVM.


---
Diffs of the changes:  (+13 -0)

 Makefile.rules |   13 +++++++++++++
 1 files changed, 13 insertions(+)


Index: llvm-test/Makefile.rules
diff -u llvm-test/Makefile.rules:1.9 llvm-test/Makefile.rules:1.10
--- llvm-test/Makefile.rules:1.9	Tue Feb 28 12:22:24 2006
+++ llvm-test/Makefile.rules	Sun Apr  9 02:18:00 2006
@@ -104,6 +104,7 @@
 	@${ECHO} "Build Object Dir : " $(PROJ_OBJ_DIR)
 	@${ECHO} "LLVM  Source Root: " $(LLVM_SRC_ROOT)
 	@${ECHO} "LLVM  Object Root: " $(LLVM_OBJ_ROOT)
+	@${ECHO} "CONFIGURATION    : " $(CONFIGURATION)
 
 ###########################################################################
 # Suffixes and implicit rules:
@@ -147,6 +148,18 @@
   endif
 endif
 
+# If ENABLE_ASSERTIONS=1 is specified (make command line or configured),
+# then adjust the CONFIGURATION name appropriately (to match LLVM makefiles)
+ifdef ENABLE_ASSERTIONS
+  ifdef ENABLE_OPTIMIZED
+  CONFIGURATION := $(CONFIGURATION)+Asserts
+  endif
+else
+  ifndef ENABLE_OPTIMIZED
+  CONFIGURATION := $(CONFIGURATION)-Asserts
+  endif
+endif
+
 #
 # Enable this for profiling support with 'gprof'
 # This automatically enables optimized builds.