From 61093e260f83cdbd64dc376a00045ae156a857cc Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Wed, 23 Nov 2016 14:15:41 -0600 Subject: [PATCH] cargo: remove code that doesn't work The comment says it doesn't work and I can confirm it won't work. --- recipes-devtools/cargo/cargo.inc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/recipes-devtools/cargo/cargo.inc b/recipes-devtools/cargo/cargo.inc index efa0988..33aab40 100644 --- a/recipes-devtools/cargo/cargo.inc +++ b/recipes-devtools/cargo/cargo.inc @@ -71,12 +71,6 @@ B = "${S}" # the crate_hash option will cause the compiler to crash RUSTFLAGS = "-C rpath ${RUSTLIB}" -PACKAGECONFIG ??= "" - -# Note: this does not appear to work very well due to our use of bitbake triples -# & rust's use of cooked triples -PACKAGECONFIG[rust-snapshot] = "--local-rust-root=${B}/rustc" - # Used in libgit2-sys's build.rs, needed for pkg-config to be used export LIBGIT2_SYS_USE_PKG_CONFIG = "1" @@ -84,8 +78,6 @@ export LIBGIT2_SYS_USE_PKG_CONFIG = "1" DISABLE_STATIC = "" do_configure () { - ${@bb.utils.contains('PACKAGECONFIG', 'rust-snapshot', '${S}/.travis.install.deps.sh', ':', d)} - "${S}/configure" \ "--prefix=${prefix}" \ "--build=${BUILD_SYS}" \