[llvm-branch-commits] [llvm-gcc-tag] r103188 - in /llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7: ./ GNUmakefile build_gcc

[Bob Wilson]

Author: bwilson
Date: Thu May  6 12:42:07 2010
New Revision: 103188

URL: http://llvm.org/viewvc/llvm-project?rev=103188&view=rev
Log:
Copy llvmgcc42-2207.6 to 2207.7 with a fix for radar 7946661:
The special OpenGL version of llvm-gcc should not install links in /usr/bin.

Added:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/
      - copied from r103126, llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.6/
Modified:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/GNUmakefile
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/build_gcc

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/GNUmakefile?rev=103188&r1=103126&r2=103188&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/GNUmakefile (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/GNUmakefile Thu May  6 12:42:07 2010
@@ -51,12 +51,8 @@
 ifndef DISABLE_LLVM
 ENABLE_LLVM = true
 # LLVM gets installed into /AppleInternal/Developer/LLVM/usr/local, not /usr.
-ifndef DEVELOPER_DIR
 PREFIX = /AppleInternal/Developer/LLVM/usr/llvm-gcc-4.2
 else
-PREFIX = ${DEVELOPER_DIR}/usr/llvm-gcc-4.2
-endif
-else
 ENABLE_LLVM = false
 endif
 
@@ -68,11 +64,7 @@
 endif
 
 ifndef LLVMCORE_PATH
-ifndef DEVELOPER_DIR
 LLVMCORE_PATH = /AppleInternal/Developer/LLVM/usr/local
-else
-LLVMCORE_PATH = ${DEVELOPER_DIR}/usr/local
-endif
 endif
 
 ifndef RC_ProjectSourceVersion
@@ -83,8 +75,12 @@
 RC_ProjectSourceSubversion = 00
 endif
 
+# NOTE: Set LLVM_BUILT_ROOTS to disable installing symlinks in /usr/bin.
+# That doesn't even make sense for the installed directory structure for
+# this special version of llvm-gcc.
 install: $(OBJROOT) $(SYMROOT) $(DSTROOT)
 	cd $(OBJROOT) && \
+	  LLVM_BUILT_ROOTS=1 \
 	  $(SRC)/build_gcc "$(RC_ARCHS)" "$(TARGETS)" \
 	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) $(ENABLE_LLVM) \
 	    $(LLVM_ASSERTIONS) $(LLVMCORE_PATH) \

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/build_gcc?rev=103188&r1=103126&r2=103188&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/build_gcc (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.7/build_gcc Thu May  6 12:42:07 2010
@@ -691,8 +691,11 @@
 done
 
 if [ "x$LLVM_BUILT_ROOTS" == "x" ]; then
-    mkdir -p $DEST_DIR/usr/bin
-    cd $DEST_DIR/usr/bin
+    # NOTE: This code should never run.  There's no reason to have anything
+    # in /AppleInternal/Developer/usr/bin, but just in case something breaks
+    # it's better to go there instead of /usr/bin.
+    mkdir -p $DEST_DIR/AppleInternal/Developer/usr/bin
+    cd $DEST_DIR/AppleInternal/Developer/usr/bin
     ln -s /AppleInternal/Developer/LLVM/usr/bin/llvm-gcc-4.2 llvm-gcc-4.2
     ln -s /AppleInternal/Developer/LLVM/usr/bin/llvm-g++-4.2 llvm-g++-4.2
 fi