From 0a522b19e8fe8f06dc30919006feb7ba5ddad9af Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Tue, 10 Jul 2007 07:19:53 +0000 Subject: [PATCH] Make sure that preprocessor symbols like _DEBUG, NDEBUG, and _GLIBC_DEBUG are put into the CPP.Defines variable. Seems the convention was corrupted with various changes made. It is important to get command line parameters into the right variable because things like llvm-config and sub-makefiles depend on it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@38486 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index 74ee5b4e34a..84c5eafc114 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -199,6 +199,7 @@ install-bytecode:: install-bytecode-local # Variables derived from configuration we are building #-------------------------------------------------------------------- +CPP.Defines := # OPTIMIZE_OPTION - The optimization level option we want to build LLVM with # this can be overridden on the make command line. ifneq ($(OS),MingW) @@ -253,11 +254,9 @@ endif # then disable assertions by defining the appropriate preprocessor symbols. ifdef DISABLE_ASSERTIONS BuildMode := $(BuildMode)-Asserts - CXX.Flags += -DNDEBUG - C.Flags += -DNDEBUG + CPP.Defines += -DNDEBUG else - CXX.Flags += -D_DEBUG - C.Flags += -D_DEBUG + CPP.Defines += -D_DEBUG endif # If ENABLE_EXPENSIVE_CHECKS=1 is specified (make command line or @@ -265,7 +264,7 @@ endif # appropriate preprocessor symbols. ifdef ENABLE_EXPENSIVE_CHECKS BuildMode := $(BuildMode)+Checks - CXX.Flags += -D_GLIBCXX_DEBUG + CPP.Defines += -D_GLIBCXX_DEBUG endif ifeq ($(ENABLE_PIC),1) -- 2.34.1