From 79e3339ab9edacb9e34d3725305d5880a974364a Mon Sep 17 00:00:00 2001 From: Nikolay Merinov Date: Thu, 5 Oct 2017 12:25:39 +0500 Subject: nspr, nss: Use BUILD_CC instead of hardcoded "gcc" Recipes nspr_4.16.bb and nss_3.31.1.bb ignored BUILD_CC and it's BUILD_CFLAGS and tried to compile with hardcoded "gcc" instead. As result build for this recipes will fail if host use different name for compiler or require any flags. Signed-off-by: Nikolay Merinov Signed-off-by: Ross Burton --- meta/recipes-support/nspr/nspr_4.16.bb | 2 +- meta/recipes-support/nss/nss_3.31.1.bb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/nspr/nspr_4.16.bb b/meta/recipes-support/nspr/nspr_4.16.bb index bb178fe712..78ef994ffd 100644 --- a/meta/recipes-support/nspr/nspr_4.16.bb +++ b/meta/recipes-support/nspr/nspr_4.16.bb @@ -155,7 +155,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export + oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export } do_compile_append() { diff --git a/meta/recipes-support/nss/nss_3.31.1.bb b/meta/recipes-support/nss/nss_3.31.1.bb index 955862fddb..588708fc31 100644 --- a/meta/recipes-support/nss/nss_3.31.1.bb +++ b/meta/recipes-support/nss/nss_3.31.1.bb @@ -66,8 +66,8 @@ do_compile_prepend_class-native() { do_compile() { export CROSS_COMPILE=1 - export NATIVE_CC="gcc" - export NATIVE_FLAGS="${HOST_CFLAGS}" + export NATIVE_CC="${BUILD_CC}" + export NATIVE_FLAGS="${BUILD_CFLAGS}" export BUILD_OPT=1 export FREEBL_NO_DEPEND=1 @@ -118,7 +118,7 @@ do_install_prepend_class-nativesdk() { do_install() { export CROSS_COMPILE=1 - export NATIVE_CC="gcc" + export NATIVE_CC="${BUILD_CC}" export BUILD_OPT=1 export FREEBL_NO_DEPEND=1 -- cgit 1.2.3-korg