From 9237d18964ff0bf76f5c37fca21ab3974d81d0d2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 21 Oct 2014 11:50:13 +0100 Subject: native.bbclass: use BUILD_* variables Instead of replicating the logic for the host compiler naming from bitbake.conf, use the BUILD_* variables directly. Also change BUILD_CPP to use gcc -E (which native.bbclass previously used), as some recipes (e.g. grub-efi) use ${CPP} with multiple input files, which gcc -E can handle but cpp can't. Signed-off-by: Ross Burton --- meta/classes/native.bbclass | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'meta/classes/native.bbclass') diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index dcd364b92c..4acc936ccd 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -61,16 +61,17 @@ PTEST_ENABLED = "0" export CONFIG_SITE = "${COREBASE}/meta/site/native" # set the compiler as well. It could have been set to something else -export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" -export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" -export FC = "${CCACHE}${HOST_PREFIX}gfortran ${HOST_CC_ARCH}" -export CPP = "${HOST_PREFIX}gcc ${HOST_CC_ARCH} -E" -export LD = "${HOST_PREFIX}ld ${HOST_LD_ARCH} " -export CCLD = "${CC}" -export AR = "${HOST_PREFIX}ar" -export AS = "${HOST_PREFIX}as ${HOST_AS_ARCH}" -export RANLIB = "${HOST_PREFIX}ranlib" -export STRIP = "${HOST_PREFIX}strip" +export CC = "${BUILD_CC}" +export CXX = "${BUILD_CXX}" +export FC = "${BUILD_FC}" +export CPP = "${BUILD_CPP}" +export LD = "${BUILD_LD}" +export CCLD = "${BUILD_CCLD}" +export AR = "${BUILD_AR}" +export AS = "${BUILD_AS}" +export RANLIB = "${BUILD_RANLIB}" +export STRIP = "${BUILD_STRIP}" +export NM = "${BUILD_NM}" # Path prefixes base_prefix = "${STAGING_DIR_NATIVE}" -- cgit 1.2.3-korg