summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNikolay Merinov <n.merinov@inango-systems.com>2017-10-05 07:25:39 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-07 22:20:40 (GMT)
commit4c3b62507713101d0603cef04a2a2c20c268f897 (patch)
treeb3594f3b0a4fad62080c2e15d0680e483042ec31 /meta
parentd2015feaaf427fea1fbbac56bfc16a9111213888 (diff)
downloadpoky-4c3b62507713101d0603cef04a2a2c20c268f897.tar.gz
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. (From OE-Core rev: 79e3339ab9edacb9e34d3725305d5880a974364a) Signed-off-by: Nikolay Merinov <n.merinov@inango-systems.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/nspr/nspr_4.16.bb2
-rw-r--r--meta/recipes-support/nss/nss_3.31.1.bb6
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 bb178fe..78ef994 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)}"
155PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 155PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
156 156
157do_compile_prepend() { 157do_compile_prepend() {
158 oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export 158 oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export
159} 159}
160 160
161do_compile_append() { 161do_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 955862f..588708f 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() {
66 66
67do_compile() { 67do_compile() {
68 export CROSS_COMPILE=1 68 export CROSS_COMPILE=1
69 export NATIVE_CC="gcc" 69 export NATIVE_CC="${BUILD_CC}"
70 export NATIVE_FLAGS="${HOST_CFLAGS}" 70 export NATIVE_FLAGS="${BUILD_CFLAGS}"
71 export BUILD_OPT=1 71 export BUILD_OPT=1
72 72
73 export FREEBL_NO_DEPEND=1 73 export FREEBL_NO_DEPEND=1
@@ -118,7 +118,7 @@ do_install_prepend_class-nativesdk() {
118 118
119do_install() { 119do_install() {
120 export CROSS_COMPILE=1 120 export CROSS_COMPILE=1
121 export NATIVE_CC="gcc" 121 export NATIVE_CC="${BUILD_CC}"
122 export BUILD_OPT=1 122 export BUILD_OPT=1
123 123
124 export FREEBL_NO_DEPEND=1 124 export FREEBL_NO_DEPEND=1