From 9fab94b8c3b313d9787c3a0537d17d765ccd5ae3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 15 Jan 2014 11:37:09 +0000 Subject: llvm: don't do out-of-tree builds manually cmake.bbclass as of oe-core 783fb88 defaults to out-of-tree builds. Use that functionality directly to clean up the recipe. Signed-off-by: Ross Burton Reviewed-by: Otavio Salvador Signed-off-by: Martin Jansa --- meta-oe/recipes-core/llvm/llvm2.inc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'meta-oe/recipes-core') diff --git a/meta-oe/recipes-core/llvm/llvm2.inc b/meta-oe/recipes-core/llvm/llvm2.inc index f683fc351a..a1f6ce87d4 100644 --- a/meta-oe/recipes-core/llvm/llvm2.inc +++ b/meta-oe/recipes-core/llvm/llvm2.inc @@ -20,13 +20,8 @@ LLVM_RELEASE = "${PV}" BBCLASSEXTEND = "native" -LLVM_BUILD_DIR = "${B}/build" LLVM_INSTALL_DIR = "${B}/llvm-install" -# llvm *must* be built out of tree -OECMAKE_SOURCEPATH = ".." -OECMAKE_BUILDPATH = "build" - # other architectures require X86 available, LLVM_EXTRA_ARCH = "X86;" LLVM_EXTRA_ARCH_x86 = "" @@ -73,7 +68,7 @@ base_do_compile_prepend() { do_install() { # Install into a private directory to be able to reorganize the files. - cd ${LLVM_BUILD_DIR} + cd ${B} oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install # Create our custom target directories @@ -101,7 +96,7 @@ do_install() { SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_sysroot_preprocess" llvm_sysroot_preprocess() { - cd ${LLVM_BUILD_DIR} + cd ${B} # Fix the paths in the config script to make it find the binaries and # library files. Doing so allows 3rd party configure scripts working @@ -118,7 +113,7 @@ llvm_sysroot_preprocess() { do_install_class-native() { # Install into a private directory to be able to reorganize the files. - cd ${LLVM_BUILD_DIR} + cd ${B} oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install # Create our custom target directories -- cgit 1.2.3-korg