From d47fe965e1a30caa220e51f239fc78ae488ea15b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 29 Apr 2014 14:16:33 -0700 Subject: llvm3: Fix build when S != B Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta-oe/recipes-core/llvm/llvm3.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-core/llvm/llvm3.inc b/meta-oe/recipes-core/llvm/llvm3.inc index 798d4a2458..a5bd896c60 100644 --- a/meta-oe/recipes-core/llvm/llvm3.inc +++ b/meta-oe/recipes-core/llvm/llvm3.inc @@ -21,14 +21,14 @@ EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1" do_configure_prepend() { # Remove RPATHs - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules + sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' ${S}/Makefile.rules # Drop "svn" suffix from version string - sed -i 's/${PV}svn/${PV}/g' configure + sed -i 's/${PV}svn/${PV}/g' ${S}/configure # Fix paths in llvm-config - sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" tools/llvm-config/llvm-config.cpp - sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" tools/llvm-config/llvm-config.cpp + sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp + sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp # Fails to build unless using separate directory from source mkdir -p ${LLVM_BUILD_DIR} -- cgit 1.2.3-korg