From e1fa6d39ce4750eb8a014280682452804e7e74f0 Mon Sep 17 00:00:00 2001 From: Johan Anderholm Date: Tue, 3 Jul 2018 22:18:19 +0200 Subject: [PATCH] Don't install rust-llvm system-wide Put rust-llvm into a directory of it's own. This avoids conflicts between the official llvm and rusts temporary one. It solves interoperability issues with meta-clang. Use /usr/lib/llvm-rust/ as prefix because that matches what llvm does themselves on debian and ubuntu. --- recipes-devtools/rust/rust-llvm.inc | 1 + recipes-devtools/rust/rust.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-devtools/rust/rust-llvm.inc b/recipes-devtools/rust/rust-llvm.inc index 1acaa70..776e270 100644 --- a/recipes-devtools/rust/rust-llvm.inc +++ b/recipes-devtools/rust/rust-llvm.inc @@ -21,6 +21,7 @@ EXTRA_OECMAKE = " \ -DLLVM_BUILD_TESTS=OFF \ -DLLVM_INCLUDE_TESTS=OFF \ -DLLVM_TARGET_ARCH=${TARGET_ARCH} \ + -DCMAKE_INSTALL_PREFIX:PATH=${libdir}/llvm-rust \ " # The debug symbols are huge here (>2GB) so suppress them since they diff --git a/recipes-devtools/rust/rust.inc b/recipes-devtools/rust/rust.inc index f0f370a..e845a52 100644 --- a/recipes-devtools/rust/rust.inc +++ b/recipes-devtools/rust/rust.inc @@ -339,7 +339,7 @@ python do_configure() { target_section = "target.{}".format(d.getVar('TARGET_SYS', True)) config.add_section(target_section) - llvm_config = d.expand("${STAGING_DIR_NATIVE}${bindir_native}/llvm-config") + llvm_config = d.expand("${STAGING_DIR_NATIVE}${libdir_native}/llvm-rust/bin/llvm-config") config.set(target_section, "llvm-config", e(llvm_config)) config.set(target_section, "cxx", e(d.expand("${RUST_TARGET_CXX}")))