[llvm-commits] [llvm-gcc-4.0] r44135 - in /llvm-gcc-4.0/trunk: GNUmakefile build_gcc

[Devang Patel]

Author: dpatel
Date: Wed Nov 14 15:29:37 2007
New Revision: 44135

URL: http://llvm.org/viewvc/llvm-project?rev=44135&view=rev
Log:
Find llvm using LLVMCORE_PATH

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

Modified: llvm-gcc-4.0/trunk/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/GNUmakefile?rev=44135&r1=44134&r2=44135&view=diff

==============================================================================
--- llvm-gcc-4.0/trunk/GNUmakefile (original)
+++ llvm-gcc-4.0/trunk/GNUmakefile Wed Nov 14 15:29:37 2007
@@ -51,6 +51,10 @@
 LLVM_ASSERTIONS := no
 endif
 
+ifndef LLVMCORE_PATH
+LLVMCORE_PATH = /usr/local
+endif
+
 ifndef RC_ProjectSourceVersion
 RC_ProjectSourceVersion = 9999
 endif
@@ -63,8 +67,9 @@
 	cd $(OBJROOT) && \
 	  $(SRC)/build_gcc "$(RC_ARCHS)" "$(TARGETS)" \
 	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) $(ENABLE_LLVM) \
-	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) \
-	    $(LLVM_ASSERTIONS)
+	    $(LLVM_ASSERTIONS) $(LLVMCORE_PATH) \
+	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
+
 # APPLE LOCAL end LLVM
 
 # installhdrs does nothing, because the headers aren't useful until

Modified: llvm-gcc-4.0/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/build_gcc?rev=44135&r1=44134&r2=44135&view=diff

==============================================================================
--- llvm-gcc-4.0/trunk/build_gcc (original)
+++ llvm-gcc-4.0/trunk/build_gcc Wed Nov 14 15:29:37 2007
@@ -66,15 +66,18 @@
 # or not.
 ENABLE_LLVM="$7"
 
+# The tenth parameter is a yes/no that indicates whether assertions should be
+# enabled in the LLVM libs/tools.
+LLVM_ASSERTIONS="$8"
+
+# The eleventh parameter indicates llvmCore location.
+LLVMCORE_PATH="$9"
+
 # The eighth parameter is the version number of the submission, e.g. 1007.
-LLVM_SUBMIT_VERSION="$8"
+LLVM_SUBMIT_VERSION="${10}"
 
 # The nineth parameter is the subversion number of the submission, e.g. 03.
-LLVM_SUBMIT_SUBVERSION="$9"
-
-# The tenth parameter is a yes/no that indicates whether assertions should be
-# enabled in the LLVM libs/tools.
-LLVM_ASSERTIONS="${10}"
+LLVM_SUBMIT_SUBVERSION="${11}"
 
 # LLVM_BIN_DIR - This is the place where llvm-gcc/llvm-g++ symlinks get installed.
 LLVM_BIN_DIR=/Developer/usr/bin
@@ -158,7 +161,7 @@
   --program-transform-name=/^[cg][^.-]*$/s/$/-$MAJ_VERS/ \
   $LIBSTDCXX_CONFIG_OPTION \
   --with-slibdir=/usr/lib \
-  --enable-llvm=/usr/local/ \
+  --enable-llvm=$LLVMCORE_PATH \
   --build=$BUILD-apple-darwin$DARWIN_VERS"
 
 # Figure out how many make processes to run.