[llvm-commits] [llvm-gcc-4.2] r102989 - /llvm-gcc-4.2/trunk/build_gcc

[Bob Wilson]

Author: bwilson
Date: Mon May  3 19:37:43 2010
New Revision: 102989

URL: http://llvm.org/viewvc/llvm-project?rev=102989&view=rev
Log:
Rename LLVM_BUILT_ROOTS variable to DISABLE_USR_LINKS and expand its use to
also control the /usr/lib/libLTO.dylib link.  Continue to recognize the old
LLVM_BUILT_ROOTS name for backward compatibility.  Radar 7915410.

Modified:
    llvm-gcc-4.2/trunk/build_gcc

Modified: llvm-gcc-4.2/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=102989&r1=102988&r2=102989&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Mon May  3 19:37:43 2010
@@ -733,11 +733,18 @@
     ln -s ../../libllvmgcc.dylib
 done
 
+# Backward compatibility: Allow LLVM_BUILT_ROOTS instead of DISABLE_USR_LINKS.
 if [ "x$LLVM_BUILT_ROOTS" == "x" ]; then
+    DISABLE_USR_LINKS=1
+fi
+# Roots built by B&I, need to include sym links in /usr/bin and /usr/lib
+# because B&I sets XCODE_DEVELOPER_USR_PATH=/.  Otherwise, we don't want those
+# sym links.
+if [ "x$DISABLE_USR_LINKS" == "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 ../../Developer/usr/bin/llvm-gcc-4.2 llvm-gcc-4.2
+    ln -s ../../Developer/usr/bin/llvm-g++-4.2 llvm-g++-4.2
 fi
 
 # Remove unwind.h from the install directory for > 10.6
@@ -759,10 +766,12 @@
   cp $LTO $DEST_DIR/Developer/usr/lib/libLTO.dylib
   strip -S $DEST_DIR/Developer/usr/lib/libLTO.dylib
 
-  # Add a symlink in /usr/lib for B&I.
-  mkdir -p $DEST_DIR/usr/lib/
-  cd $DEST_DIR/usr/lib && \
-    ln -s ../../Developer/usr/lib/libLTO.dylib ./libLTO.dylib
+  if [ "x$DISABLE_USR_LINKS" == "x" ]; then
+    # Add a symlink in /usr/lib for B&I.
+    mkdir -p $DEST_DIR/usr/lib/
+    cd $DEST_DIR/usr/lib && \
+      ln -s ../../Developer/usr/lib/libLTO.dylib ./libLTO.dylib
+  fi
 fi
 
 # LLVM LOCAL end