[llvm-branch-commits] [llvm-branch] r98772 - in /llvm/branches/Apple/Morbo: Makefile.rules utils/buildit/build_llvm

[Jim Grosbach]

Author: grosbach
Date: Wed Mar 17 16:29:48 2010
New Revision: 98772

URL: http://llvm.org/viewvc/llvm-project?rev=98772&view=rev
Log:
merge 98770 98771

Modified:
    llvm/branches/Apple/Morbo/Makefile.rules
    llvm/branches/Apple/Morbo/utils/buildit/build_llvm

Modified: llvm/branches/Apple/Morbo/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/Makefile.rules?rev=98772&r1=98771&r2=98772&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/Makefile.rules (original)
+++ llvm/branches/Apple/Morbo/Makefile.rules Wed Mar 17 16:29:48 2010
@@ -578,8 +578,6 @@
 ifeq ($(TARGET_OS),Darwin)
   ifneq ($(ARCH),ARM)
     TargetCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION)
-  else
-    TargetCommonOpts += -marm
   endif
 endif
 

Modified: llvm/branches/Apple/Morbo/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/utils/buildit/build_llvm?rev=98772&r1=98771&r2=98772&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/utils/buildit/build_llvm (original)
+++ llvm/branches/Apple/Morbo/utils/buildit/build_llvm Wed Mar 17 16:29:48 2010
@@ -106,11 +106,10 @@
   # Try to use the platform llvm-gcc. Fall back to gcc if it's not available.
   for prog in gcc g++ ; do
     P=$DIR/bin/arm-apple-darwin$DARWIN_VERS-${prog}
-# FIXME: Uncomment once llvm-gcc works for this
-#    T=`xcrun -find llvm-${prog}`
-#    if [ "x$T" = "x" ] ; then
+    T=`xcrun -find llvm-${prog}`
+    if [ "x$T" = "x" ] ; then
       T=`xcrun -sdk $SDKROOT -find ${prog}`
-#    fi
+    fi
     echo '#!/bin/sh' > $P || exit 1
     echo 'exec '$T' -arch armv6 -isysroot '${SDKROOT}' "$@"' >> $P || exit 1
     chmod a+x $P || exit 1