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

[Bob Wilson]

Author: bwilson
Date: Thu Apr 15 00:33:59 2010
New Revision: 101349

URL: http://llvm.org/viewvc/llvm-project?rev=101349&view=rev
Log:
Special version that installs in /AppleInternal

Added:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/
      - copied from r101339, llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.2/
Modified:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/GNUmakefile
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/build_gcc

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/GNUmakefile?rev=101349&r1=101339&r2=101349&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/GNUmakefile (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/GNUmakefile Thu Apr 15 00:33:59 2010
@@ -35,15 +35,13 @@
 #######################################################################
 
 # LLVM LOCAL begin
+# Install special OpenGL version to AppleInternal directory.  Radar 7864940.
+LLVM_ROOT_PATH = /AppleInternal/Developer/LLVM_For_OpenGL_Sim
 # 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
+# LLVM gets installed into $(LLVM_ROOT_PATH)/Developer/usr/local, not /usr.
+PREFIX = $(LLVM_ROOT_PATH)/Developer/usr/llvm-gcc-4.2
 else
 ENABLE_LLVM = false
 endif
@@ -56,11 +54,7 @@
 endif
 
 ifndef LLVMCORE_PATH
-ifndef DEVELOPER_DIR
-LLVMCORE_PATH = /Developer/usr/local
-else
-LLVMCORE_PATH = ${DEVELOPER_DIR}/usr/local
-endif
+LLVMCORE_PATH = $(LLVM_ROOT_PATH)/Developer/usr/local
 endif
 
 ifndef RC_ProjectSourceVersion

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/build_gcc?rev=101349&r1=101339&r2=101349&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/build_gcc (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2105.3/build_gcc Thu Apr 15 00:33:59 2010
@@ -89,6 +89,8 @@
 # LLVM_BIN_DIR - This is the place where llvm-gcc/llvm-g++ symlinks get installed.
 LLVM_BIN_DIR=$DEST_ROOT/../bin
 
+# Install special OpenGL version to AppleInternal directory.  Radar 7864940.
+LLVM_ROOT_PATH=/AppleInternal/Developer/LLVM_For_OpenGL_Sim
 # LLVM LOCAL end
 
 # The current working directory is where the build will happen.
@@ -112,7 +114,7 @@
 LIBSTDCXX_VERSION=4.2.1
 # LLVM LOCAL begin
 # DO NOT USE $DEST_ROOT to check LIBSTDCXX_VERSION here. Directly use /usr here.
-# $DEST_ROOT is /Developer for llvm-gcc
+# $DEST_ROOT is $LLVM_ROOT_PATH/Developer for llvm-gcc
 if [ ! -d "/usr/include/c++/$LIBSTDCXX_VERSION" ]; then
   LIBSTDCXX_VERSION=4.0.0
 fi
@@ -573,11 +575,11 @@
 # LLVM LOCAL begin
 # Compress manpages
 gzip -f $MDIR/*
-mkdir -p $DEST_DIR/Developer/usr/share/man/man1
-cp $ORIG_SRC_DIR/gcc/doc/llvm-gcc.1 $DEST_DIR/Developer/usr/share/man/man1/llvm-gcc.1
-cp $ORIG_SRC_DIR/gcc/doc/llvm-gcc.1 $DEST_DIR/Developer/usr/share/man/man1/llvm-g++.1
-gzip -f $DEST_DIR/Developer/usr/share/man/man1/llvm-gcc.1
-gzip -f $DEST_DIR/Developer/usr/share/man/man1/llvm-g++.1
+mkdir -p $DEST_DIR$LLVM_ROOT_PATH/Developer/usr/share/man/man1
+cp $ORIG_SRC_DIR/gcc/doc/llvm-gcc.1 $DEST_DIR$LLVM_ROOT_PATH/Developer/usr/share/man/man1/llvm-gcc.1
+cp $ORIG_SRC_DIR/gcc/doc/llvm-gcc.1 $DEST_DIR$LLVM_ROOT_PATH/Developer/usr/share/man/man1/llvm-g++.1
+gzip -f $DEST_DIR$LLVM_ROOT_PATH/Developer/usr/share/man/man1/llvm-gcc.1
+gzip -f $DEST_DIR$LLVM_ROOT_PATH/Developer/usr/share/man/man1/llvm-g++.1
 # LLVM LOCAL end
 
 # Build driver-driver using fully-named drivers
@@ -691,8 +693,8 @@
 if [ "x$LLVM_BUILT_ROOTS" == "x" ]; then
     mkdir -p $DEST_DIR/usr/bin
     cd $DEST_DIR/usr/bin
-    ln -s /Developer/usr/bin/llvm-gcc-4.2 llvm-gcc-4.2
-    ln -s /Developer/usr/bin/llvm-g++-4.2 llvm-g++-4.2
+    ln -s $LLVM_ROOT_PATH/Developer/usr/bin/llvm-gcc-4.2 llvm-gcc-4.2
+    ln -s $LLVM_ROOT_PATH/Developer/usr/bin/llvm-g++-4.2 llvm-g++-4.2
 fi
 # LLVM LOCAL end