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

[Bill Wendling]

Author: void
Date: Thu Feb 25 18:10:26 2010
New Revision: 97189

URL: http://llvm.org/viewvc/llvm-project?rev=97189&view=rev
Log:
Modified 2207.5 to install in different directory.

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

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.6/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.6/GNUmakefile?rev=97189&r1=97179&r2=97189&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.6/GNUmakefile (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.6/GNUmakefile Thu Feb 25 18:10:26 2010
@@ -50,9 +50,9 @@
 # LLVM defaults to enabled.
 ifndef DISABLE_LLVM
 ENABLE_LLVM = true
-# LLVM gets installed into /Developer/usr/local, not /usr.
+# LLVM gets installed into /AppleInternal/Developer/LLVM/usr/local, not /usr.
 ifndef DEVELOPER_DIR
-PREFIX = /Developer/usr/llvm-gcc-4.2
+PREFIX = /AppleInternal/Developer/LLVM/usr/llvm-gcc-4.2
 else
 PREFIX = ${DEVELOPER_DIR}/usr/llvm-gcc-4.2
 endif
@@ -69,7 +69,7 @@
 
 ifndef LLVMCORE_PATH
 ifndef DEVELOPER_DIR
-LLVMCORE_PATH = /Developer/usr/local
+LLVMCORE_PATH = /AppleInternal/Developer/LLVM/usr/local
 else
 LLVMCORE_PATH = ${DEVELOPER_DIR}/usr/local
 endif

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.6/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.6/build_gcc?rev=97189&r1=97179&r2=97189&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.6/build_gcc (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2207.6/build_gcc Thu Feb 25 18:10:26 2010
@@ -112,7 +112,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 /AppleInternal/Developer/LLVM for llvm-gcc
 if [ ! -d "/usr/include/c++/$LIBSTDCXX_VERSION" ]; then
   LIBSTDCXX_VERSION=4.0.0
 fi
@@ -575,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/AppleInternal/Developer/LLVM/usr/share/man/man1
+cp $ORIG_SRC_DIR/gcc/doc/llvm-gcc.1 $DEST_DIR/AppleInternal/Developer/LLVM/usr/share/man/man1/llvm-gcc.1
+cp $ORIG_SRC_DIR/gcc/doc/llvm-gcc.1 $DEST_DIR/AppleInternal/Developer/LLVM/usr/share/man/man1/llvm-g++.1
+gzip -f $DEST_DIR/AppleInternal/Developer/LLVM/usr/share/man/man1/llvm-gcc.1
+gzip -f $DEST_DIR/AppleInternal/Developer/LLVM/usr/share/man/man1/llvm-g++.1
 # LLVM LOCAL end
 
 # Build driver-driver using fully-named drivers
@@ -693,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 /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
 # LLVM LOCAL end