diff options
| -rw-r--r-- | recipes/llvm/llvm-native.inc | 7 | ||||
| -rw-r--r-- | recipes/llvm/llvm.inc | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/recipes/llvm/llvm-native.inc b/recipes/llvm/llvm-native.inc index ab1ce56000..b3c409a757 100644 --- a/recipes/llvm/llvm-native.inc +++ b/recipes/llvm/llvm-native.inc @@ -1,6 +1,6 @@ require llvm.inc -DEPENDS = "llvm-common-native cmake-native" +DEPENDS = "llvm-common-native cmake-native binutils-cross" inherit native @@ -14,13 +14,16 @@ EXTRA_OECMAKE = "\ -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \ -DCMAKE_RANLIB:FILEPATH=${RANLIB} \ -DCMAKE_STRIP:FILEPATH=${STRIP} \ + -DNM_PATH:FILEPATH=${NM} \ " do_stage() { + cd ${OECMAKE_BUILDPATH} + llvm_stage install -d ${STAGING_BINDIR} - install -m 0755 build/bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR} + install -m 0755 bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR} } diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc index 7e6bacb3e7..1046bd737e 100644 --- a/recipes/llvm/llvm.inc +++ b/recipes/llvm/llvm.inc @@ -44,7 +44,6 @@ LLVM_RELEASE = "${PV}" # llvm *must* be built out of tree OECMAKE_SOURCEPATH = ".." OECMAKE_BUILDPATH = "build" -EXTRA_OEMAKE = "-C build" EXTRA_OECMAKE = "\ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm${LLVM_RELEASE}/tblgen \ -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \ @@ -63,7 +62,7 @@ llvm_stage() { # Create our custom target directories install -d ${STAGING_BINDIR}/llvm${LLVM_RELEASE} - install -d ${STAGING_INCDIR}/llvm${LLVM_RELEASE} + install -d ${STAGING_INCDIR}/llvm${LLVM_RELEASE} install -d ${STAGING_LIBDIR}/llvm${LLVM_RELEASE} # Move headers into their own directory @@ -84,7 +83,7 @@ llvm_stage() { install {} ${STAGING_BINDIR}/llvm${LLVM_RELEASE} \; # LLVM does not install this by default. - install build/bin/tblgen ${STAGING_BINDIR}/llvm${LLVM_RELEASE} + install bin/tblgen ${STAGING_BINDIR}/llvm${LLVM_RELEASE} # Fix the paths in the config script to make it find the binaries and # library files. Doing so allows 3rd party configure scripts working @@ -93,14 +92,16 @@ llvm_stage() { -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \ -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \ -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \ - build/bin/llvm-config > build/bin/llvm-config${LLVM_RELEASE} + bin/llvm-config > bin/llvm-config${LLVM_RELEASE} } do_stage() { + cd ${OECMAKE_BUILDPATH} + llvm_stage install -d ${STAGING_BINDIR_CROSS} - install -m 0755 build/bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR_CROSS} + install -m 0755 bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR_CROSS} } # Retrieve the target in a way that is compatible to the arch |