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

[Bob Wilson]

Author: bwilson
Date: Mon May  3 19:35:30 2010
New Revision: 102988

URL: http://llvm.org/viewvc/llvm-project?rev=102988&view=rev
Log:
Remove special case treatment based on llvmgcc42_Embedded project name.
Radar 7885098.

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=102988&r1=102987&r2=102988&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Mon May  3 19:35:30 2010
@@ -126,7 +126,6 @@
 ARM_CONFIGFLAGS="--with-gxx-include-dir=/usr/include/c++/$ARM_LIBSTDCXX_VERSION"
 
 if [ -n "$ARM_SDK" ]; then
-  ARM_PLATFORM=`xcodebuild -version -sdk $ARM_SDK PlatformPath`
   ARM_SYSROOT=`xcodebuild -version -sdk $ARM_SDK Path`
 else
   # Use bootstrap SDK if it is available.
@@ -136,17 +135,9 @@
   else
     ARM_SYSROOT=/
   fi
-  ARM_PLATFORM=/
 fi
 ARM_CONFIGFLAGS="$ARM_CONFIGFLAGS --with-build-sysroot=\"$ARM_SYSROOT\""
 
-# If it's being built for iPhoneOS, assume the llvmCore bits are under
-# iPhoneOS platform directory.
-if [ "x$RC_ProjectName" = "xllvmgcc42_Embedded" ]; then
-  LLVMCORE_PATH="${ARM_PLATFORM}${LLVMCORE_PATH}"
-  DEST_ROOT="${ARM_PLATFORM}${DEST_ROOT}"
-fi
-
 # If building an ARM target, check that the required directories exist
 # and query the libSystem arm slices to determine which multilibs we should
 # build.
@@ -622,11 +613,7 @@
 # Compress manpages
 gzip -f $MDIR/*
 
-if [ "x$RC_ProjectName" = "xllvmgcc42_Embedded" ]; then
-MAN1_DIR=${DEST_DIR}${ARM_PLATFORM}/Developer/usr/share/man/man1
-else
 MAN1_DIR=$DEST_DIR/Developer/usr/share/man/man1
-fi
 mkdir -p ${MAN1_DIR}
 cp $ORIG_SRC_DIR/gcc/doc/llvm-gcc.1 ${MAN1_DIR}/llvm-gcc.1
 cp $ORIG_SRC_DIR/gcc/doc/llvm-gcc.1 ${MAN1_DIR}/llvm-g++.1
@@ -746,20 +733,11 @@
     ln -s ../../libllvmgcc.dylib
 done
 
-if [ "x$RC_ProjectName" == "xllvmgcc42_Embedded" ]; then
-    if [ "x$LLVM_BUILT_ROOTS" == "x" ]; then
-        mkdir -p $DEST_DIR${ARM_PLATFORM}/usr/bin
-        cd $DEST_DIR${ARM_PLATFORM}/usr/bin
-        ln -s ${ARM_PLATFORM}/Developer/usr/bin/llvm-gcc-4.2 llvm-gcc-4.2
-        ln -s ${ARM_PLATFORM}/Developer/usr/bin/llvm-g++-4.2 llvm-g++-4.2
-    fi
-else
-    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
-    fi
+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
 fi
 
 # Remove unwind.h from the install directory for > 10.6