rebased patch

This commit is contained in:
Sylvestre Ledru 2015-02-19 07:47:17 +00:00
parent df0cabfb30
commit 2fabffe1a8

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.7~svn229683/compiler-rt/make/platform/clang_linux.mk Index: llvm-toolchain-snapshot_3.7~svn229829/compiler-rt/make/platform/clang_linux.mk
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.7~svn229683.orig/compiler-rt/make/platform/clang_linux.mk --- llvm-toolchain-snapshot_3.7~svn229829.orig/compiler-rt/make/platform/clang_linux.mk
+++ llvm-toolchain-snapshot_3.7~svn229683/compiler-rt/make/platform/clang_linux.mk +++ llvm-toolchain-snapshot_3.7~svn229829/compiler-rt/make/platform/clang_linux.mk
@@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTa @@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTa
# Define configs only if arch in triple is i386 or x86_64 # Define configs only if arch in triple is i386 or x86_64
@ -20,15 +20,15 @@ Index: llvm-toolchain-snapshot_3.7~svn229683/compiler-rt/make/platform/clang_lin
SupportedArches := i386 SupportedArches := i386
ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0) ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0)
SupportedArches += x86_64 SupportedArches += x86_64
Index: llvm-toolchain-snapshot_3.7~svn229683/clang/runtime/compiler-rt/Makefile Index: llvm-toolchain-snapshot_3.7~svn229829/clang/runtime/compiler-rt/Makefile
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.7~svn229683.orig/clang/runtime/compiler-rt/Makefile --- llvm-toolchain-snapshot_3.7~svn229829.orig/clang/runtime/compiler-rt/Makefile
+++ llvm-toolchain-snapshot_3.7~svn229683/clang/runtime/compiler-rt/Makefile +++ llvm-toolchain-snapshot_3.7~svn229829/clang/runtime/compiler-rt/Makefile
@@ -165,6 +165,7 @@ BuildRuntimeLibraries: @@ -158,6 +158,7 @@ BuildRuntimeLibraries:
ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \ ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \
ProjObjRoot=$(PROJ_OBJ_DIR) \ ProjObjRoot=$(PROJ_OBJ_DIR) \
CC="$(ToolDir)/clang" \ CC="$(ToolDir)/clang" \
+ LD_LIBRARY_PATH=../build-llvm/Release/lib \ + LD_LIBRARY_PATH=../build-llvm/Release/lib \
VERBOSE=$(VERBOSE) \ VERBOSE=$(VERBOSE) \
LLVM_ANDROID_TOOLCHAIN_DIR="$(LLVM_ANDROID_TOOLCHAIN_DIR)" \
$(RuntimeDirs:%=clang_%) $(RuntimeDirs:%=clang_%)
.PHONY: BuildRuntimeLibraries