aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2014-11-14 08:57:01 +0100
committerKoen Kooi <koen.kooi@linaro.org>2014-11-14 08:58:09 +0100
commitc3d66f3914cb4e3085967817165fb956c1a50cbf (patch)
treeb985c984336ea3eda989a65ac74b553f3c383626
parent580e03697cbb118cd0078c5c7660e05bd9b5bbaf (diff)
downloadmeta-linaro-c3d66f3914cb4e3085967817165fb956c1a50cbf.tar.gz
openjdk: pass correct sysroot to compiler
OE-core is poisoning the builtin sysroot to catch bad recipes, so fix openjdk to use the OE sysroot. Change-Id: I57b4c960553fd8f23d4af0fa50c57cc37d6e3125 Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-rw-r--r--meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc b/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc
index 1b273095..ba374070 100644
--- a/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc
+++ b/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc
@@ -52,8 +52,8 @@ JAVA_HOME[unexport] = "1"
S="${WORKDIR}/openjdk8-aarch64-port-snapshot"
# The compiler tests in do_configure seem to drop TARGET_CC_ARCH from $CC, so add it into CFLAGS.
-CFLAGS =+ "${TARGET_CC_ARCH}"
-CXXFLAGS =+ "${TARGET_CC_ARCH}"
+CFLAGS =+ "${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
+CXXFLAGS =+ "${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
do_configure() {
unset MAKE