From 7ea8496ce085d507166efbd3a5e4d20444d3c35f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 9 Nov 2012 10:09:29 +0000 Subject: meta: remove redundant _FOR_BUILD variables (From OE-Core rev: acabd2158d9004dedfdfad8c170b77d32684f3fc) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 4 ++-- meta/recipes-devtools/rpm/rpm_5.4.9.bb | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index ff64882..1e59296 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -76,9 +76,9 @@ export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib" export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" +# autotools.bbclass sets the _FOR_BUILD variables, but for some reason we need +# to unset LD_LIBRARY_PATH. export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" -export CPP_FOR_BUILD = "${BUILD_CPP}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" do_configure[vardeps] += "MULTIARCH" diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index 3268160..0721284 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb @@ -350,7 +350,6 @@ do_configure() { -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i configure export varprefix=${localstatedir} - export CC_FOR_BUILD="${BUILD_CC}" oe_runconf } -- cgit v1.1