[llvm-branch-commits] [llvm-branch] r93425 - /llvm/branches/Apple/Zoidberg/utils/buildit/GNUmakefile

[Bill Wendling]

Author: void
Date: Thu Jan 14 04:22:25 2010
New Revision: 93425

URL: http://llvm.org/viewvc/llvm-project?rev=93425&view=rev
Log:
$ svn merge -c 93423 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r93423 into '.':
U    utils/buildit/GNUmakefile


Modified:
    llvm/branches/Apple/Zoidberg/utils/buildit/GNUmakefile

Modified: llvm/branches/Apple/Zoidberg/utils/buildit/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/utils/buildit/GNUmakefile?rev=93425&r1=93424&r2=93425&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/utils/buildit/GNUmakefile (original)
+++ llvm/branches/Apple/Zoidberg/utils/buildit/GNUmakefile Thu Jan 14 04:22:25 2010
@@ -36,7 +36,7 @@
 
 # Unless assertions are forced on in the GMAKE command line, enable them.
 ifndef ENABLE_ASSERTIONS
-LLVM_ASSERTIONS := yes
+ENABLE_ASSERTIONS := yes
 endif
 
 # Default is optimized build.
@@ -59,7 +59,7 @@
 	cd $(OBJROOT) && \
 	  $(SRC)/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
 	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \
-	    $(LLVM_ASSERTIONS) $(LLVM_OPTIMIZED) \
+	    $(ENABLE_ASSERTIONS) $(LLVM_OPTIMIZED) \
 	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion)