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

[Bob Wilson]

Author: bwilson
Date: Fri Jul 10 16:20:50 2009
New Revision: 75284

URL: http://llvm.org/viewvc/llvm-project?rev=75284&view=rev
Log:
Adjust ARM build options, checking for specific features instead of
checking the version numbers.

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=75284&r1=75283&r2=75284&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Fri Jul 10 16:20:50 2009
@@ -139,27 +139,17 @@
   ARM_TOOLROOT=/
 fi
 
-# ARM may require a sysroot option.
-ARM_SYSROOT=$ARM_EXTRA_SDK
-# If the default sysroot does not exist, try a different location.
-if [ ! -d $ARM_SYSROOT ]; then
-  ARM_SYSROOT=$ARM_PLATFORM/Developer/SDKs/$ARM_IPHONE_SDK
-fi
-
-# Split the MACOSX_DEPLOYMENT_TARGET into major/minor versions.
-if [ -z "$MACOSX_DEPLOYMENT_TARGET" ]; then
-  # Anything 10.5 or earlier is treated the same below.
-  MACOSX_DEPLOYMENT_MAJOR=10
-  MACOSX_DEPLOYMENT_MINOR=5
+# ARM may require a sysroot option.  Check if libSystem has an ARM slice
+# as an indication of whether the files in / support ARM.
+if lipo -info /usr/lib/libSystem.dylib | grep arm; then
+  ARM_SYSROOT=/
 else
-  MACOSX_DEPLOYMENT_MAJOR=`echo $MACOSX_DEPLOYMENT_TARGET | sed 's/\..*//'`
-  MACOSX_DEPLOYMENT_MINOR=`echo $MACOSX_DEPLOYMENT_TARGET | sed 's/[0-9]*\.\([0-9]*\).*/\1/'`
-fi
-if [ $MACOSX_DEPLOYMENT_MAJOR -eq 10 -a \
-     $MACOSX_DEPLOYMENT_MINOR -le 5 ]; then
+  if [ -d $ARM_EXTRA_SDK ]; then
+    ARM_SYSROOT=$ARM_EXTRA_SDK
+  else
+    ARM_SYSROOT=$ARM_PLATFORM/Developer/SDKs/$ARM_IPHONE_SDK
+  fi
   ARM_CONFIGFLAGS="$ARM_CONFIGFLAGS --with-sysroot=\"$ARM_SYSROOT\""
-else
-  ARM_SYSROOT=/
 fi
 
 # If building an ARM target, check that the required directories exist.