stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8308585: AC_REQUIRE: `PLATFORM_EXTRACT_TARGET_AND_BUILD' was expanded before it was required

Browse Source 
Reviewed-by: mikael
This commit is contained in:
Erik Joelsson 2023-06-14 13:26:54 +00:00
parent 84d010a24b
commit 554b4d7243
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
make/autoconf/platform.m4
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -660,11 +660,10 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
PLATFORM_CHECK_DEPRECATION PLATFORM_CHECK_DEPRECATION
]) ])
AC_DEFUN_ONCE([PLATFORM_CHECK_DEPRECATION], AC_DEFUN([PLATFORM_CHECK_DEPRECATION],
[ [
AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@], AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@],
[Suppress the error when configuring for a deprecated port @<:@no@:>@])]) [Suppress the error when configuring for a deprecated port @<:@no@:>@])])
AC_REQUIRE([PLATFORM_EXTRACT_TARGET_AND_BUILD])
if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$OPENJDK_TARGET_CPU" = xx86; then if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$OPENJDK_TARGET_CPU" = xx86; then
if test "x$enable_deprecated_ports" = "xyes"; then if test "x$enable_deprecated_ports" = "xyes"; then
AC_MSG_WARN([The Windows 32-bit x86 port is deprecated and may be removed in a future release.]) AC_MSG_WARN([The Windows 32-bit x86 port is deprecated and may be removed in a future release.])

3
make/conf/jib-profiles.js
View File

@ -463,7 +463,8 @@ var getJibProfilesProfiles = function (input, common, data) {
target_cpu: "x86", target_cpu: "x86",
build_cpu: "x64", build_cpu: "x64",
dependencies: ["devkit", "gtest"], dependencies: ["devkit", "gtest"],
configure_args: concat(common.configure_args_32bit), configure_args: concat(common.configure_args_32bit,
"--enable-deprecated-ports"),
}, },
"windows-aarch64": { "windows-aarch64": {