summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-12-02 02:31:32 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-12-02 02:31:32 +0000
commitff9865220ccd618cab2d8fbc63e58ac6cd7357f0 (patch)
tree50f2ca72d9392fea32ebc727c05365df2db5da43 /runtime
parentc5f9a011a5c13361a3a56ed7fa3507b4b585063e (diff)
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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145672 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
-rw-r--r--runtime/compiler-rt/Makefile15
1 files changed, 14 insertions, 1 deletions
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile
index a8cd2e981d..3e047fcf6f 100644
--- a/runtime/compiler-rt/Makefile
+++ b/runtime/compiler-rt/Makefile
@@ -82,10 +82,23 @@ RuntimeLibrary.darwin.Configs := \
# 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
####