build/compiler-rt: Stop forcing off -integrated-as for compiler-rt builds.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152054 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile
index a1e6f09..534168b 100644
--- a/runtime/compiler-rt/Makefile
+++ b/runtime/compiler-rt/Makefile
@@ -28,12 +28,6 @@
# 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 :=
-ifeq ($(ARCH), arm)
-CLANG_CCFLAGS += -no-integrated-as
-endif
-
# We don't currently support building runtime libraries when we are
# cross-compiling. The issue is that we really want to be set up so that the
# available compiler targets are independent of the current build.
@@ -82,11 +76,6 @@
RuntimeLibrary.darwin.Configs := \
eprintf 10.4 osx ios cc_kext \
asan_osx profile_osx profile_ios
-
-# On Darwin, fake Clang into using the iOS assembler (since compiler-rt wants to
-# build ARM bits).
-CLANG_CCFLAGS += -ccc-install-dir \
- /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/
endif
# On Linux, include a library which has all the runtime functions.
@@ -119,7 +108,7 @@
$(Verb) $(MAKE) -C $(COMPILERRT_SRC_ROOT) \
ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \
ProjObjRoot=$(PROJ_OBJ_DIR) \
- CC="$(ToolDir)/clang $(CLANG_CCFLAGS)" \
+ CC="$(ToolDir)/clang" \
$(RuntimeDirs:%=clang_%)
.PHONY: BuildRuntimeLibraries
CleanRuntimeLibraries: