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 | 8907811e4bbd6b67aa5e33a75156846df1e9a879 (patch) | |
| tree | d0b38e409eb78e911d3cd1674daaa5d542c2209f /clang/runtime | |
| parent | 47740deb2684ed5449b1ae3253a3f3cd65e6eb99 (diff) | |
| download | llvm-8907811e4bbd6b67aa5e33a75156846df1e9a879.zip llvm-8907811e4bbd6b67aa5e33a75156846df1e9a879.tar.gz llvm-8907811e4bbd6b67aa5e33a75156846df1e9a879.tar.bz2 | |
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.
llvm-svn: 184665
Diffstat (limited to 'clang/runtime')
| -rw-r--r-- | clang/runtime/compiler-rt/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile index 5590f1a..59a62e7 100644 --- a/clang/runtime/compiler-rt/Makefile +++ b/clang/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 |