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

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.358 -> 1.359
---
Log message:

Check for DISABLE_ASSERTIONS, not ENABLE_ASSERTIONS


---
Diffs of the changes:  (+5 -9)

 Makefile.rules |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.358 llvm/Makefile.rules:1.359
--- llvm/Makefile.rules:1.358	Fri Apr  7 11:06:18 2006
+++ llvm/Makefile.rules	Sun Apr  9 18:41:14 2006
@@ -224,18 +224,13 @@
 
 # If ENABLE_ASSERTIONS=1 is specified (make command line or configured),
 # then enable assertions by defining the appropriate preprocessor symbols.
-ifdef ENABLE_ASSERTIONS
-  ifdef ENABLE_OPTIMIZED
-  BuildMode := $(BuildMode)+Asserts
-  endif
-  CXX.Flags += -D_DEBUG
-  C.Flags   += -D_DEBUG
-else
-  ifndef ENABLE_OPTIMIZED
+ifdef DISABLE_ASSERTIONS
   BuildMode := $(BuildMode)-Asserts
-  endif
   CXX.Flags += -DNDEBUG
   C.Flags   += -DNDEBUG
+else
+  CXX.Flags += -D_DEBUG
+  C.Flags   += -D_DEBUG
 endif
 
 CXX.Flags     += $(CXXFLAGS)
@@ -1699,3 +1694,4 @@
 	$(Echo) "LexFiles     : " '$(LexFiles)'
 	$(Echo) "Module       : " '$(Module)'
 	$(Echo) "FilesToConfig: " '$(FilesToConfigPATH)'
+	$(Echo) "SubDirs      : " '$(SubDirs)'