[llvm-commits] [llvm-gcc-4.2] r102511 - in /llvm-gcc-4.2/trunk: GNUmakefile build_gcc

[Bob Wilson]

Author: bwilson
Date: Wed Apr 28 13:31:19 2010
New Revision: 102511

URL: http://llvm.org/viewvc/llvm-project?rev=102511&view=rev
Log:
Remove support from Apple's internal build script for building llvm-gcc
with llvm disabled.  You can still do that with an FSF-style build but
I don't see any reason for Apple-style builds to support that.

Modified:
    llvm-gcc-4.2/trunk/GNUmakefile
    llvm-gcc-4.2/trunk/build_gcc

Modified: llvm-gcc-4.2/trunk/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/GNUmakefile?rev=102511&r1=102510&r2=102511&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/GNUmakefile (original)
+++ llvm-gcc-4.2/trunk/GNUmakefile Wed Apr 28 13:31:19 2010
@@ -47,18 +47,12 @@
 #######################################################################
 
 # LLVM LOCAL begin
-# LLVM defaults to enabled.
-ifndef DISABLE_LLVM
-ENABLE_LLVM = true
 # LLVM gets installed into /Developer/usr/local, not /usr.
 ifndef DEVELOPER_DIR
 PREFIX = /Developer/usr/llvm-gcc-4.2
 else
 PREFIX = ${DEVELOPER_DIR}/usr/llvm-gcc-4.2
 endif
-else
-ENABLE_LLVM = false
-endif
 
 # Unless assertions are forced on in the GMAKE command line, disable them.
 ifndef ENABLE_ASSERTIONS
@@ -84,7 +78,7 @@
 install: $(OBJROOT) $(SYMROOT) $(DSTROOT)
 	cd $(OBJROOT) && \
 	  $(SRC)/build_gcc "$(RC_ARCHS)" "$(TARGETS)" \
-	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) $(ENABLE_LLVM) \
+	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) true \
 	    $(ENABLE_ASSERTIONS) $(LLVMCORE_PATH) \
 	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
 

Modified: llvm-gcc-4.2/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=102511&r1=102510&r2=102511&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Wed Apr 28 13:31:19 2010
@@ -69,9 +69,8 @@
 SYM_DIR="$6"
 
 # LLVM LOCAL begin
-# The seventh parameter is true/false indicating whether LLVM should be enabled
-# or not.
-ENABLE_LLVM="$7"
+# The seventh parameter is currently unused.
+ENABLE_LLVM=true
 
 # The eighth parameter is a yes/no that indicates whether assertions should be
 # enabled in the LLVM libs/tools.