[cfe-commits] r151367 - /cfe/trunk/runtime/compiler-rt/Makefile

[Rafael Espindola]

Author: rafael
Date: Fri Feb 24 10:22:39 2012
New Revision: 151367

URL: http://llvm.org/viewvc/llvm-project?rev=151367&view=rev
Log:
Use -no-integrated-as only on ARM. The X86 and X86-64 integrated as have been
the default for clang for some time now and can handle compiler-rt.

Modified:
    cfe/trunk/runtime/compiler-rt/Makefile

Modified: cfe/trunk/runtime/compiler-rt/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/compiler-rt/Makefile?rev=151367&r1=151366&r2=151367&view=diff
==============================================================================
--- cfe/trunk/runtime/compiler-rt/Makefile (original)
+++ cfe/trunk/runtime/compiler-rt/Makefile Fri Feb 24 10:22:39 2012
@@ -29,7 +29,10 @@
 COMPILERRT_SRC_ROOT := $(LLVM_SRC_ROOT)/projects/compiler-rt
 
 # Additional flags to pass to Clang.
-CLANG_CCFLAGS := -no-integrated-as
+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