Changes in directory llvm:
Makefile.rules updated: 1.357 -> 1.358 --- Log message: For PR723: http://llvm.cs.uiuc.edu/PR723 : 1. Don't force debug builds to have assertion checking turned on always. Let the default (on) be taken, or overridden by the command line 2. Create two new BuildModes based on assertion checking: Release+Assert and Debug-Assert. 3. Ensure that when building a distribution we get a release build with assertions enabled, regardless of the tree's configuration. 4. (unrelated) Fix library name generation for llvm-config usage. --- Diffs of the changes: (+13 -10) Makefile.rules | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.357 llvm/Makefile.rules:1.358 --- llvm/Makefile.rules:1.357 Fri Apr 7 03:31:56 2006 +++ llvm/Makefile.rules Fri Apr 7 11:06:18 2006 @@ -219,17 +219,21 @@ C.Flags := -g LD.Flags := -g KEEP_SYMBOLS := 1 - # Assertions default to ON for debug builds. - ENABLE_ASSERTIONS := 1 endif endif -# If this is a debug build or if ENABLE_ASSERTIONS=1 is specified on the make -# command line, enable assertions. +# 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 + BuildMode := $(BuildMode)-Asserts + endif CXX.Flags += -DNDEBUG C.Flags += -DNDEBUG endif @@ -580,10 +584,9 @@ #--------------------------------------------------------- ifeq ($(firstword $(LLVMLIBS)),config) LLVM_CONFIG := $(LLVM_SRC_ROOT)/utils/llvm-config/llvm-config -LLVMLIBS := $(shell $(LLVM_CONFIG) $(wordlist 2,9999,$(LLVMLIBS))) -LLVMLIBS := $(patsubst $(PROJ_libdir)/%,%,$(LLVMLIBS)) +LLVMLIBS := $(shell $(LLVM_CONFIG) --libnames $(wordlist 2,9999,$(LLVMLIBS))) +LLVMLIBS := $(patsubst lib%.a,%.a,$(LLVMLIBS)) LLVMLIBS := $(patsubst %.o,%,$(LLVMLIBS)) -LLVMLIBS := $(patsubst -l%,%.a,$(LLVMLIBS)) endif ifeq ($(LLVMLIBS),JIT) @@ -1529,7 +1532,7 @@ $(EchoCmd) Removing old $(DistDir) ; \ $(RM) -rf $(DistDir); \ $(EchoCmd) Making 'all' to verify build ; \ - $(MAKE) all ; \ + $(MAKE) ENABLE_OPTIMIZED=1 ENABLE_ASSERTIONS=1 all ; \ fi $(Echo) Building Distribution Directory $(DistDir) $(Verb) $(MKDIR) $(DistDir) @@ -1590,8 +1593,8 @@ if test "$$subdir" \!= "." ; then \ new_distdir="$(DistDir)/$$subdir" ; \ test -d "$$new_distdir" || $(MKDIR) "$$new_distdir" || exit 1; \ - ( cd $$subdir && $(MAKE) DistDir="$$new_distdir" distdir ) || \ - exit 1; \ + ( cd $$subdir && $(MAKE) ENABLE_OPTIMIZED=1 ENABLE_ASSERTIONS=1 \ + DistDir="$$new_distdir" distdir ) || exit 1; \ fi; \ done $(Verb) if test "$(DistDir)" = "$(TopDistDir)" ; then \ _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
