From c9d8e15322cc5844665c98135d36a1e8bd7e1a40 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 16 May 2014 22:25:01 +0000 Subject: [PATCH] Fix the build wrt to compiler-rt --- debian/patches/compiler-rt-path.diff | 13 +++++++++++++ debian/patches/series | 1 + 2 files changed, 14 insertions(+) create mode 100644 debian/patches/compiler-rt-path.diff diff --git a/debian/patches/compiler-rt-path.diff b/debian/patches/compiler-rt-path.diff new file mode 100644 index 00000000..e24268f2 --- /dev/null +++ b/debian/patches/compiler-rt-path.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-snapshot-3.5~svn208979/compiler-rt/make/platform/clang_linux.mk +=================================================================== +--- llvm-toolchain-snapshot-3.5~svn208979.orig/compiler-rt/make/platform/clang_linux.mk 2014-05-16 19:13:05.702922367 +0200 ++++ llvm-toolchain-snapshot-3.5~svn208979/compiler-rt/make/platform/clang_linux.mk 2014-05-16 19:13:27.551329647 +0200 +@@ -11,7 +11,7 @@ + # cross compilers). For now, we just find the target architecture of the + # compiler and only define configurations we know that compiler can generate. + CompilerTargetTriple := $(shell \ +- LANG=C $(CC) -v 2>&1 | grep 'Target:' | cut -d' ' -f2) ++ LD_LIBRARY_PATH=../build-llvm/Release/lib LANG=C $(CC) -v 2>&1 | grep 'Target:' | cut -d' ' -f2) + ifeq ($(CompilerTargetTriple),) + $(error "unable to infer compiler target triple for $(CC)") + endif diff --git a/debian/patches/series b/debian/patches/series index d10f2bb9..16ec0f73 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -36,3 +36,4 @@ disable-display-PASS-UNSUPPORTED-XFAIL.diff lldb-link-atomic.diff fix-llvm-config-obj-src-root.patch suffixsvn.diff +compiler-rt-path.diff