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

[Daniel Dunbar]

Author: ddunbar
Date: Thu Dec  1 20:31:32 2011
New Revision: 145672

URL: http://llvm.org/viewvc/llvm-project?rev=145672&view=rev
Log:
runtime/Linux: Initial support for tying compiler-rt build into Clang build on
Linux.
 - Currently just builds a full library, and only on x86, and only for the
   target arch.

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=145672&r1=145671&r2=145672&view=diff
==============================================================================
--- cfe/trunk/runtime/compiler-rt/Makefile (original)
+++ cfe/trunk/runtime/compiler-rt/Makefile Thu Dec  1 20:31:32 2011
@@ -82,10 +82,23 @@
 
 # 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
+
+# On Linux, include a library which has all the runtime functions.
+ifeq ($(OS),Linux)
+RuntimeDirs += linux
+RuntimeLibrary.linux.Configs :=
+
+# We currently only try to generate runtime libraries on x86.
+ifeq ($(ARCH),x86)
+RuntimeLibrary.linux.Configs += full-i386
+endif
+ifeq ($(ARCH),x86_64)
+RuntimeLibrary.linux.Configs += full-x86_64
+endif
+
 endif
 
 ####