diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2013-06-23 10:10:25 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2013-06-23 10:10:25 +0000 |
| commit | 230cdaaab58a2cc00012c5766e396a3eba2aa940 (patch) | |
| tree | 504ad232a13f08412623f7fec8ec775bae1697bd /runtime | |
| parent | 39b230a614dfb558aa0730c0f84f681b93094635 (diff) | |
| download | clang_35a-230cdaaab58a2cc00012c5766e396a3eba2aa940.tar.gz | |
The makefile build system had two lists of the 32-bit runtime libraries
to build and one had grown out of sync. Put this list in a variable so
this doesn't happen again.
The whole thing here is somewhat suspicious as we don't support 32-bit
environments with a 64-bit bi-arch capable compiler, but none have
complained yet about this so I'm just leaving it alone.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@184665 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/compiler-rt/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile index 5590f1a83c..59a62e7918 100644 --- a/runtime/compiler-rt/Makefile +++ b/runtime/compiler-rt/Makefile @@ -96,11 +96,14 @@ TryCompile = \ $(1) $$cflags $(2) -o /dev/null > /dev/null 2> /dev/null ; \ echo $$?) -# We currently only try to generate runtime libraries on x86. -ifeq ($(ARCH),x86) -RuntimeLibrary.linux.Configs += \ +# We try to build 32-bit runtimes both on 32-bit hosts and 64-bit hosts. +Runtime32BitConfigs = \ full-i386.a profile-i386.a san-i386.a asan-i386.a ubsan-i386.a \ ubsan_cxx-i386.a + +# We currently only try to generate runtime libraries on x86. +ifeq ($(ARCH),x86) +RuntimeLibrary.linux.Configs += $(Runtime32BitConfigs) endif ifeq ($(ARCH),x86_64) @@ -114,8 +117,7 @@ RuntimeLibrary.linux.Configs += \ # executable. test_source = $(LLVM_SRC_ROOT)/tools/clang/runtime/compiler-rt/clang_linux_test_input.c ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-m32),0) -RuntimeLibrary.linux.Configs += san-i386.a asan-i386.a ubsan-i386.a \ - ubsan_cxx-i386.a +RuntimeLibrary.linux.Configs += $(Runtime32BitConfigs) endif ifneq ($(LLVM_ANDROID_TOOLCHAIN_DIR),) RuntimeLibrary.linux.Configs += asan-arm-android.so |