aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Anton Kozlov <akozlov@azul.com> 2021-04-02 12:09:32 -0700
committerGravatar Anton Kozlov <akozlov@azul.com> 2021-04-02 12:09:32 -0700
commitdf62dd078ddbb19b3e3bf96d0be77d7f5665ef8e (patch)
treea5e629dbc4903d1ace17a84abf9fe370115416aa
parent3938a4732257a12273250e1ff5d86dc109b1ccbf (diff)
downloadjdk-pr/3325.tar.gz
jdk-pr/3325.zip
Add both ways cross-compilationpr/3325
-rw-r--r--make/autoconf/flags.m49
1 files changed, 6 insertions, 3 deletions
diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
index ef2eb88a875..e2f29d7930b 100644
--- a/make/autoconf/flags.m4
+++ b/make/autoconf/flags.m4
@@ -265,9 +265,12 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
fi
fi
- if test "x$OPENJDK_TARGET_OS" = xmacosx &&
- test "x$OPENJDK_TARGET_CPU" = xaarch64; then
- MACHINE_FLAG="$MACHINE_FLAG -arch arm64"
+ if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
+ MACHINE_FLAG="$MACHINE_FLAG -arch arm64"
+ elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ MACHINE_FLAG="$MACHINE_FLAG -arch x86_64"
+ fi
fi
# FIXME: global flags are not used yet...