aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-04-25 15:36:11 +0800
committerHongxu Jia <hongxu.jia@windriver.com>2019-04-25 16:33:55 +0800
commit10d34f24e99031e4691bf1527ef0e9bd38174b13 (patch)
tree909e9965ca927f8cdc3c1d10029761e0661d7c0d
parentbd665ee36771edc575a1db403319a9d5960df252 (diff)
downloadmeta-tensorflow-10d34f24e99031e4691bf1527ef0e9bd38174b13.tar.gz
meta-tensorflow-10d34f24e99031e4691bf1527ef0e9bd38174b13.tar.bz2
meta-tensorflow-10d34f24e99031e4691bf1527ef0e9bd38174b13.zip
do not hardcode JAVA_HOME
Use ${STAGING_LIBDIR_NATIVE} rather than ${RECIPE_SYSROOT_NATIVE}/usr/lib. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--classes/bazel.bbclass2
-rw-r--r--recipes-devtools/bazel/bazel-native_0.21.0.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/bazel.bbclass b/classes/bazel.bbclass
index 5d3a00a..0d2bbdb 100644
--- a/classes/bazel.bbclass
+++ b/classes/bazel.bbclass
@@ -8,7 +8,7 @@ export BAZEL_ARGS="--output_user_root=${WORKDIR}/bazel/user_root \
--bazelrc=${S}/bazelrc \
"
-export JAVA_HOME="${RECIPE_SYSROOT_NATIVE}/usr/lib/jvm/openjdk-8-native"
+export JAVA_HOME="${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native"
do_prepare_recipe_sysroot[postfuncs] += "do_install_bazel"
do_install_bazel() {
diff --git a/recipes-devtools/bazel/bazel-native_0.21.0.bb b/recipes-devtools/bazel/bazel-native_0.21.0.bb
index 04c69af..3395c2f 100644
--- a/recipes-devtools/bazel/bazel-native_0.21.0.bb
+++ b/recipes-devtools/bazel/bazel-native_0.21.0.bb
@@ -22,7 +22,7 @@ S="${WORKDIR}"
TS_DL_DIR ??= "${DL_DIR}"
do_compile () {
- export JAVA_HOME="${RECIPE_SYSROOT_NATIVE}/usr/lib/jvm/openjdk-8-native"
+ export JAVA_HOME="${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native"
TMPDIR="${TOPDIR}/bazel" \
VERBOSE=yes \
EXTRA_BAZEL_ARGS="--distdir=${TS_DL_DIR}" \