summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorEric Sandall2019-07-09 03:24:47 +0000
committerEric Sandall2019-07-09 03:24:47 +0000
commitdaa61693aa9a387632997ff2b91f7933737340a7 (patch)
tree8bf9d1f3f148702d508b6748bc2308dc67afd6cc /java
parent20cfd5b3d9b8260e89396e391ff4cc42d1c027fe (diff)
openjdk12: Set 64-bit for EM64T as well.
Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs changed SMGL_COMPAT_ARCHS[1] from x86_64 to em64t.
Diffstat (limited to 'java')
-rw-r--r--java/openjdk12/HISTORY5
-rwxr-xr-xjava/openjdk12/PRE_BUILD2
2 files changed, 6 insertions, 1 deletions
diff --git a/java/openjdk12/HISTORY b/java/openjdk12/HISTORY
index 02e5e14ba6..4580f52718 100644
--- a/java/openjdk12/HISTORY
+++ b/java/openjdk12/HISTORY
@@ -1,2 +1,7 @@
+2019-07-08 Eric Sandall <sandalle@sourcemage.org>
+ * Set 64-bit for EM64T as well.
+ Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs changed
+ SMGL_COMPAT_ARCHS[1] from x86_64 to em64t.
+
2019-05-31 Remko van der Vossen <wich@sourcemage.org>
* Created spell.
diff --git a/java/openjdk12/PRE_BUILD b/java/openjdk12/PRE_BUILD
index eb807ae4f9..0bfa2a4156 100755
--- a/java/openjdk12/PRE_BUILD
+++ b/java/openjdk12/PRE_BUILD
@@ -3,7 +3,7 @@ default_pre_build &&
#
# Java binaries have hardcoded /lib64/ld-linux-x86-64.so.2
#
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" || "${SMGL_COMPAT_ARCHS[1]}" == "em64t" ]]
then
if [[ ! -d $INSTALL_ROOT/lib64 ]] && [[ ! -h $INSTALL_ROOT/lib64 ]]
then