diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index ff64882d14..1e592962ee 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" | |||
76 | export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" | 76 | export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" |
77 | export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" | 77 | export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" |
78 | 78 | ||
79 | # autotools.bbclass sets the _FOR_BUILD variables, but for some reason we need | ||
80 | # to unset LD_LIBRARY_PATH. | ||
79 | export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" | 81 | export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" |
80 | export CPP_FOR_BUILD = "${BUILD_CPP}" | ||
81 | export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" | ||
82 | 82 | ||
83 | MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" | 83 | MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" |
84 | do_configure[vardeps] += "MULTIARCH" | 84 | 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 3268160d86..072128403a 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() { | |||
350 | -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i configure | 350 | -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i configure |
351 | 351 | ||
352 | export varprefix=${localstatedir} | 352 | export varprefix=${localstatedir} |
353 | export CC_FOR_BUILD="${BUILD_CC}" | ||
354 | oe_runconf | 353 | oe_runconf |
355 | } | 354 | } |
356 | 355 | ||