diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2010-10-22 12:54:34 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2010-10-22 12:54:34 +0000 |
| commit | ed50d3855345113cedbe6517d8801b3fe61a7d2b (patch) | |
| tree | a12f4dd787e4c232467e8511f322d5cbefc0c9bb | |
| parent | 9cf3b58ebbcb8eac5480a4ac1c2a774b9ced8a42 (diff) | |
| download | external_llvm-ed50d3855345113cedbe6517d8801b3fe61a7d2b.zip external_llvm-ed50d3855345113cedbe6517d8801b3fe61a7d2b.tar.gz external_llvm-ed50d3855345113cedbe6517d8801b3fe61a7d2b.tar.bz2 | |
Standardise all build-mode affecting {EN,DIS}ABLE_* make options to
test equality to 1, and fix/update documentation to reflect this
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@117094 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.rules | 10 | ||||
| -rw-r--r-- | docs/MakefileGuide.html | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.rules b/Makefile.rules index 547eb27..d9645b6 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -301,7 +301,7 @@ ifneq ($(REQUIRES_RTTI), 1) CXX.Flags += -fno-rtti endif -ifdef ENABLE_COVERAGE +ifeq ($(ENABLE_COVERAGE),1) BuildMode := $(BuildMode)+Coverage CXX.Flags += -ftest-coverage -fprofile-arcs C.Flags += -ftest-coverage -fprofile-arcs @@ -309,17 +309,17 @@ endif # If DISABLE_ASSERTIONS=1 is specified (make command line or configured), # then disable assertions by defining the appropriate preprocessor symbols. -ifndef DISABLE_ASSERTIONS +ifeq ($(DISABLE_ASSERTIONS),1) + CPP.Defines += -DNDEBUG +else BuildMode := $(BuildMode)+Asserts CPP.Defines += -D_DEBUG -else - CPP.Defines += -DNDEBUG endif # If ENABLE_EXPENSIVE_CHECKS=1 is specified (make command line or # configured), then enable expensive checks by defining the # appropriate preprocessor symbols. -ifdef ENABLE_EXPENSIVE_CHECKS +ifeq ($(ENABLE_EXPENSIVE_CHECKS),1) BuildMode := $(BuildMode)+Checks CPP.Defines += -D_GLIBCXX_DEBUG -DXDEBUG endif diff --git a/docs/MakefileGuide.html b/docs/MakefileGuide.html index a66f78a..2ef0954 100644 --- a/docs/MakefileGuide.html +++ b/docs/MakefileGuide.html @@ -640,18 +640,18 @@ generate dependencies when running the compiler. Use of this feature is discouraged and it may be removed at a later date.</dd> <dt><a name="ENABLE_OPTIMIZED"><tt>ENABLE_OPTIMIZED</tt></a></dt> - <dd>If set to any value, causes the build to generate optimized objects, + <dd>If set to 1, causes the build to generate optimized objects, libraries and executables. This alters the flags specified to the compilers and linkers. Generally debugging won't be a fun experience with an optimized build.</dd> <dt><a name="ENABLE_PROFILING"><tt>ENABLE_PROFILING</tt></a></dt> - <dd>If set to any value, causes the build to generate both optimized and + <dd>If set to 1, causes the build to generate both optimized and profiled objects, libraries and executables. This alters the flags specified to the compilers and linkers to ensure that profile data can be collected from the tools built. Use the <tt>gprof</tt> tool to analyze the output from the profiled tools (<tt>gmon.out</tt>).</dd> <dt><a name="DISABLE_ASSERTIONS"><tt>DISABLE_ASSERTIONS</tt></a></dt> - <dd>If set to any value, causes the build to disable assertions, even if + <dd>If set to 1, causes the build to disable assertions, even if building a debug or profile build. This will exclude all assertion check code from the build. LLVM will execute faster, but with little help when things go wrong.</dd> |