diff options
| author |   Ross Burton <ross.burton@intel.com> | 2014-01-15 11:37:09 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-22 12:22:35 +0100 |
| commit | 9fab94b8c3b313d9787c3a0537d17d765ccd5ae3 (patch) | |
| tree | 2f7e2c961cee39cc228b310bd622c8b43f5f7dcd | |
| parent | 1b0f81827c18d5676a7ce8a26375951293fb6306 (diff) | |
| download | meta-openembedded-9fab94b8c3b313d9787c3a0537d17d765ccd5ae3.tar.gz | |
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 <ross.burton@intel.com>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-core/llvm/llvm2.inc | 11 |
1 files changed, 3 insertions, 8 deletions
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 |