aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-02-25 22:48:55 -0800
committerKhem Raj <raj.khem@gmail.com>2019-02-26 10:16:24 -0800
commitd06ded18033f15881a7a3ecfaf3799833a067d3b (patch)
tree23c35836c8350ba5e28bffd61b869a60a5857223 /meta-oe
parente42cc4a8e26aeb3f8aa9f87c25ff6742c04a7625 (diff)
downloadmeta-openembedded-d06ded18033f15881a7a3ecfaf3799833a067d3b.tar.gz
meta-openembedded-d06ded18033f15881a7a3ecfaf3799833a067d3b.tar.bz2
meta-openembedded-d06ded18033f15881a7a3ecfaf3799833a067d3b.zip
mozjs: Fix cross-builds of nsinstall
nsinstall must be built for host, so we need to define HOST_* compiler defines so, it gets built using native compiler correctly Disable stripping, OE will do it Disable optimizing, set BUILD_OPT Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb b/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb
index 74dd15bfc..92d15724f 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb
@@ -45,7 +45,7 @@ EXTRA_OECONF = " \
--host=${BUILD_SYS} \
--prefix=${prefix} \
--libdir=${libdir} \
- --disable-tests \
+ --disable-tests --disable-strip --disable-optimize \
--with-nspr-libs='-lplds4 -lplc4 -lnspr4' \
${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \
"
@@ -53,9 +53,15 @@ EXTRA_OECONF = " \
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--x-includes=no --x-libraries=no,virtual/libx11"
-EXTRA_OEMAKE_task-compile += "OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'"
+EXTRA_OEMAKE_task-compile += "BUILD_OPT=1 OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'"
EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static"
+export HOST_CC = "${BUILD_CC}"
+export HOST_CXX = "${BUILD_CXX}"
+export HOST_CFLAGS = "${BUILD_CFLAGS}"
+export HOST_CPPFLAGS = "${BUILD_CPPFLAGS}"
+export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}"
+
do_configure() {
export SHELL="/bin/sh"
export TMP="${B}"