[llvm-branch-commits] [cfe-branch] r125334 - /cfe/branches/Apple/whitney/runtime/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Thu Feb 10 20:06:13 2011
New Revision: 125334

URL: http://llvm.org/viewvc/llvm-project?rev=125334&view=rev
Log:
Merge r125328:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Fri Feb 11 01:29:49 2011 +0000

    build/compiler-rt: Fake Clang into using the right assembler to build the ARM
    bits for the runtime libraries.

Modified:
    cfe/branches/Apple/whitney/runtime/Makefile

Modified: cfe/branches/Apple/whitney/runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/runtime/Makefile?rev=125334&r1=125333&r2=125334&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/runtime/Makefile (original)
+++ cfe/branches/Apple/whitney/runtime/Makefile Thu Feb 10 20:06:13 2011
@@ -28,6 +28,9 @@
 # Expect compiler-rt to be in llvm/projects/compiler-rt
 COMPILERRT_SRC_ROOT := $(LLVM_SRC_ROOT)/projects/compiler-rt
 
+# Additional flags to pass to Clang.
+CLANG_CCFLAGS := -no-integrated-as
+
 ifndef CLANG_NO_RUNTIME
 ifeq ($(shell test -d $(COMPILERRT_SRC_ROOT) && echo OK),OK)
 
@@ -40,6 +43,13 @@
 ifeq ($(OS),Darwin)
 RuntimeDirs += darwin
 RuntimeLibrary.darwin.Configs = eprintf 10.4 armv6 cc_kext
+
+# On Darwin, fake Clang into using the iOS assembler (since compiler-rt wants to
+# build ARM bits).
+ifeq ($(OS),Darwin)
+CLANG_CCFLAGS += -ccc-install-dir \
+	/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/
+endif
 endif
 
 # Rule to build the compiler-rt libraries we need.
@@ -50,7 +60,7 @@
 	$(Verb) $(MAKE) -C $(COMPILERRT_SRC_ROOT) \
 	  ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \
 	  ProjObjRoot=$(PROJ_OBJ_DIR) \
-	  CC="$(ToolDir)/clang -no-integrated-as" \
+	  CC="$(ToolDir)/clang $(CLANG_CCFLAGS)" \
 	  $(RuntimeDirs:%=clang_%)
 .PHONY: BuildRuntimeLibraries
 CleanRuntimeLibraries: