[llvm-branch-commits] [llvm-gcc-branch] r79939 - /llvm-gcc-4.2/branches/Apple/Leela/build_gcc

[Bill Wendling]

Author: void
Date: Mon Aug 24 16:36:31 2009
New Revision: 79939

URL: http://llvm.org/viewvc/llvm-project?rev=79939&view=rev
Log:
$ svn merge -c 79932 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r79932 into '.':
U    build_gcc


Modified:
    llvm-gcc-4.2/branches/Apple/Leela/build_gcc

Modified: llvm-gcc-4.2/branches/Apple/Leela/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Leela/build_gcc?rev=79939&r1=79938&r2=79939&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Leela/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Leela/build_gcc Mon Aug 24 16:36:31 2009
@@ -170,7 +170,7 @@
     exit 1
   fi
   if [ "x$RC_ProjectName" = "xllvmgcc42_Embedded" ]; then
-    ARM_MULTILIB_ARCHS=${ARCH_OPTIONS}
+    ARM_MULTILIB_ARCHS="armv6 armv7"
   elif [ "x$ARM_MULTILIB_ARCHS" = "x" ] ; then
     ARM_MULTILIB_ARCHS=`/usr/bin/lipo -info $ARM_SYSROOT/usr/lib/libSystem.dylib | cut -d':' -f 3 | sed -e 's/x86_64//' -e 's/i386//' -e 's/ppc7400//' -e 's/ppc64//' -e 's/^ *//' -e 's/ $//'`
   fi;