mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-11-04 04:22:11 +00:00
35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
Index: llvm-toolchain-snapshot-3.8~svn249990/compiler-rt/make/platform/clang_linux.mk
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot-3.8~svn249990.orig/compiler-rt/make/platform/clang_linux.mk
|
|
+++ llvm-toolchain-snapshot-3.8~svn249990/compiler-rt/make/platform/clang_linux.mk
|
|
@@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTa
|
|
|
|
# Define configs only if arch in triple is i386 or x86_64
|
|
CompilerTargetArch := $(firstword $(subst -, ,$(CompilerTargetTriple)))
|
|
-ifeq ($(call contains,i386 x86_64,$(CompilerTargetArch)),true)
|
|
+ifeq ($(call contains,i386 x86_64 i586 i686,$(CompilerTargetArch)),true)
|
|
|
|
# TryCompile compiler source flags
|
|
# Returns exit code of running a compiler invocation.
|
|
@@ -35,7 +35,7 @@ TryCompile = \
|
|
echo $$?)
|
|
|
|
test_source = $(ProjSrcRoot)/make/platform/clang_linux_test_input.c
|
|
-ifeq ($(CompilerTargetArch),i386)
|
|
+ifneq (,$(filter $(CompilerTargetArch),i386 i586 i686))
|
|
SupportedArches := i386
|
|
ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0)
|
|
SupportedArches += x86_64
|
|
Index: llvm-toolchain-snapshot-3.8~svn249990/clang/runtime/compiler-rt/Makefile
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot-3.8~svn249990.orig/clang/runtime/compiler-rt/Makefile
|
|
+++ llvm-toolchain-snapshot-3.8~svn249990/clang/runtime/compiler-rt/Makefile
|
|
@@ -161,6 +161,7 @@ BuildRuntimeLibraries:
|
|
ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \
|
|
ProjObjRoot=$(PROJ_OBJ_DIR) \
|
|
CC="$(ToolDir)/clang" \
|
|
+ LD_LIBRARY_PATH=../build-llvm/Release/lib \
|
|
VERBOSE=$(VERBOSE) \
|
|
$(RuntimeDirs:%=clang_%)
|
|
.PHONY: BuildRuntimeLibraries
|