summaryrefslogtreecommitdiffstats
path: root/bin-java
diff options
context:
space:
mode:
authorEric Sandall2019-07-09 03:46:01 +0000
committerEric Sandall2019-07-09 03:46:01 +0000
commit250b18e43039a887034784fbe2b6b69126941d1f (patch)
tree388f236cb4a8867b6e83e636e0e7927582cfb3a3 /bin-java
parentddd142a7d681e24abdaee9400a8bafcf9f7ef3f8 (diff)
openjdk12-bin: 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 'bin-java')
-rw-r--r--bin-java/openjdk12-bin/HISTORY5
-rwxr-xr-xbin-java/openjdk12-bin/PRE_BUILD2
2 files changed, 6 insertions, 1 deletions
diff --git a/bin-java/openjdk12-bin/HISTORY b/bin-java/openjdk12-bin/HISTORY
index ab6d61b..30f338c 100644
--- a/bin-java/openjdk12-bin/HISTORY
+++ b/bin-java/openjdk12-bin/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-25 Remko van der Vossen <wich@sourcemage.org>
* Created spell
diff --git a/bin-java/openjdk12-bin/PRE_BUILD b/bin-java/openjdk12-bin/PRE_BUILD
index eb807ae..0bfa2a4 100755
--- a/bin-java/openjdk12-bin/PRE_BUILD
+++ b/bin-java/openjdk12-bin/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