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
This commit is contained in:
Reid Spencer 2007-07-10 07:19:53 +00:00
parent af825c840e
commit 0a522b19e8

View File

@ -199,6 +199,7 @@ install-bytecode:: install-bytecode-local
# Variables derived from configuration we are building # Variables derived from configuration we are building
#-------------------------------------------------------------------- #--------------------------------------------------------------------
CPP.Defines :=
# OPTIMIZE_OPTION - The optimization level option we want to build LLVM with # OPTIMIZE_OPTION - The optimization level option we want to build LLVM with
# this can be overridden on the make command line. # this can be overridden on the make command line.
ifneq ($(OS),MingW) ifneq ($(OS),MingW)
@ -253,11 +254,9 @@ endif
# then disable assertions by defining the appropriate preprocessor symbols. # then disable assertions by defining the appropriate preprocessor symbols.
ifdef DISABLE_ASSERTIONS ifdef DISABLE_ASSERTIONS
BuildMode := $(BuildMode)-Asserts BuildMode := $(BuildMode)-Asserts
CXX.Flags += -DNDEBUG CPP.Defines += -DNDEBUG
C.Flags += -DNDEBUG
else else
CXX.Flags += -D_DEBUG CPP.Defines += -D_DEBUG
C.Flags += -D_DEBUG
endif endif
# If ENABLE_EXPENSIVE_CHECKS=1 is specified (make command line or # If ENABLE_EXPENSIVE_CHECKS=1 is specified (make command line or
@ -265,7 +264,7 @@ endif
# appropriate preprocessor symbols. # appropriate preprocessor symbols.
ifdef ENABLE_EXPENSIVE_CHECKS ifdef ENABLE_EXPENSIVE_CHECKS
BuildMode := $(BuildMode)+Checks BuildMode := $(BuildMode)+Checks
CXX.Flags += -D_GLIBCXX_DEBUG CPP.Defines += -D_GLIBCXX_DEBUG
endif endif
ifeq ($(ENABLE_PIC),1) ifeq ($(ENABLE_PIC),1)