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

8339128: Cannot resolve user specified tool properly after JDK-8338304

Browse Source 
Reviewed-by: erikj, ihse
This commit is contained in:
Jiangli Zhou 2024-11-02 01:11:20 +00:00
parent 3c7082a633
commit 8c1cf8fabe
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/autoconf/flags-ldflags.m4
View File

@ -73,8 +73,10 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
if test "x$OPENJDK_TARGET_OS" = xlinux; then if test "x$OPENJDK_TARGET_OS" = xlinux; then
# Clang needs the lld linker to work correctly # Clang needs the lld linker to work correctly
BASIC_LDFLAGS="-fuse-ld=lld -Wl,--exclude-libs,ALL" BASIC_LDFLAGS="-fuse-ld=lld -Wl,--exclude-libs,ALL"
if test "x$CXX_IS_USER_SUPPLIED" = xfalse && test "x$CC_IS_USER_SUPPLIED" = xfalse; then
UTIL_REQUIRE_PROGS(LLD, lld) UTIL_REQUIRE_PROGS(LLD, lld)
fi fi
fi
if test "x$OPENJDK_TARGET_OS" = xaix; then if test "x$OPENJDK_TARGET_OS" = xaix; then
BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-bnolibpath -Wl,-bnoexpall \ BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-bnolibpath -Wl,-bnoexpall \
-Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k" -Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k"

2
make/autoconf/toolchain.m4
View File

@ -445,6 +445,7 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist]) AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist])
fi fi
fi fi
$1_IS_USER_SUPPLIED=true
else else
# No user supplied value. Locate compiler ourselves. # No user supplied value. Locate compiler ourselves.
@ -462,6 +463,7 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
HELP_MSG_MISSING_DEPENDENCY([devkit]) HELP_MSG_MISSING_DEPENDENCY([devkit])
AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG]) AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG])
fi fi
$1_IS_USER_SUPPLIED=false
fi fi
# Now we have a compiler binary in $1. Make sure it's okay. # Now we have a compiler binary in $1. Make sure it's okay.