Check for DISABLE_ASSERTIONS, not ENABLE_ASSERTIONS

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@27552 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index c1225402c10ed9de84a6d0e3af9b5a93336e01c9..dd307a14351875da4b4d248dec2f85a606e829bb 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -224,18 +224,13 @@ endif
 
 # 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 @@ printvars::
        $(Echo) "LexFiles     : " '$(LexFiles)'
        $(Echo) "Module       : " '$(Module)'
        $(Echo) "FilesToConfig: " '$(FilesToConfigPATH)'
+       $(Echo) "SubDirs      : " '$(SubDirs)'