[llvm-branch-commits] [llvm-gcc-branch] r93426 - /llvm-gcc-4.2/branches/Apple/Zoidberg/GNUmakefile

[Bill Wendling]

Author: void
Date: Thu Jan 14 04:29:50 2010
New Revision: 93426

URL: http://llvm.org/viewvc/llvm-project?rev=93426&view=rev
Log:
$ svn merge -c -72619 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Reverse-merging r72619 into '.':
U    gcc/cgraph.c
U    gcc/cgraph.h
U    gcc/cgraphunit.c
U    gcc/cp/semantics.c
U    gcc/llvm-convert.cpp
U    gcc/ipa.c


Modified:
    llvm-gcc-4.2/branches/Apple/Zoidberg/GNUmakefile

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

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Zoidberg/GNUmakefile (original)
+++ llvm-gcc-4.2/branches/Apple/Zoidberg/GNUmakefile Thu Jan 14 04:29:50 2010
@@ -62,7 +62,7 @@
 
 # Unless assertions are forced on in the GMAKE command line, enable them.
 ifndef ENABLE_ASSERTIONS
-LLVM_ASSERTIONS := yes
+ENABLE_ASSERTIONS := yes
 endif
 
 ifndef LLVMCORE_PATH
@@ -85,7 +85,7 @@
 	cd $(OBJROOT) && \
 	  $(SRC)/build_gcc "$(RC_ARCHS)" "$(TARGETS)" \
 	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) $(ENABLE_LLVM) \
-	    $(LLVM_ASSERTIONS) $(LLVMCORE_PATH) \
+	    $(ENABLE_ASSERTIONS) $(LLVMCORE_PATH) \
 	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
 
 # LLVM LOCAL end