| 1 |
# HG changeset patch |
| 2 |
# User ihse |
| 3 |
# Date 1454642639 0 |
| 4 |
# Fri Feb 05 03:23:59 2016 +0000 |
| 5 |
# Node ID 61798573efe5a9efa67e268a52cf61263abb4396 |
| 6 |
# Parent 842cc183c9f6d29270ff002238248978c08f0a66 |
| 7 |
8148351, PR2842: Only display resolved symlink for compiler, do not change path |
| 8 |
Reviewed-by: erikj |
| 9 |
|
| 10 |
diff -r 5096b6468914 common/autoconf/toolchain.m4 |
| 11 |
--- openjdk/./common/autoconf/toolchain.m4 Tue Jan 14 10:25:22 2014 -0800 |
| 12 |
+++ openjdk/./common/autoconf/toolchain.m4 Fri Feb 05 20:02:15 2016 +0000 |
| 13 |
@@ -147,38 +147,22 @@ |
| 14 |
fi |
| 15 |
BASIC_FIXUP_EXECUTABLE($1) |
| 16 |
TEST_COMPILER="[$]$1" |
| 17 |
- # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links |
| 18 |
- # to 'xlc' but it is crucial that we invoke the compiler with the right name! |
| 19 |
- if test "x$OPENJDK_BUILD_OS" != xaix; then |
| 20 |
- AC_MSG_CHECKING([resolved symbolic links for $1]) |
| 21 |
- BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER) |
| 22 |
- AC_MSG_RESULT([$TEST_COMPILER]) |
| 23 |
- fi |
| 24 |
- AC_MSG_CHECKING([if $1 is disguised ccache]) |
| 25 |
|
| 26 |
- COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"` |
| 27 |
- if test "x$COMPILER_BASENAME" = "xccache"; then |
| 28 |
- AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler]) |
| 29 |
- # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache. |
| 30 |
- # We want to control ccache invocation ourselves, so ignore this cc and try |
| 31 |
- # searching again. |
| 32 |
+ AC_MSG_CHECKING([resolved symbolic links for $1]) |
| 33 |
+ SYMLINK_ORIGINAL="$TEST_COMPILER" |
| 34 |
+ BASIC_REMOVE_SYMBOLIC_LINKS(SYMLINK_ORIGINAL) |
| 35 |
+ if test "x$TEST_COMPILER" = "x$SYMLINK_ORIGINAL"; then |
| 36 |
+ AC_MSG_RESULT([no symlink]) |
| 37 |
+ else |
| 38 |
+ AC_MSG_RESULT([$SYMLINK_ORIGINAL]) |
| 39 |
|
| 40 |
- # Remove the path to the fake ccache cc from the PATH |
| 41 |
- RETRY_COMPILER_SAVED_PATH="$PATH" |
| 42 |
- COMPILER_DIRNAME=`$DIRNAME [$]$1` |
| 43 |
- PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`" |
| 44 |
- |
| 45 |
- # Try again looking for our compiler |
| 46 |
- AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3) |
| 47 |
- BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1) |
| 48 |
- PATH="$RETRY_COMPILER_SAVED_PATH" |
| 49 |
- |
| 50 |
- AC_MSG_CHECKING([for resolved symbolic links for $1]) |
| 51 |
- BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1) |
| 52 |
- AC_MSG_RESULT([$PROPER_COMPILER_$1]) |
| 53 |
- $1="$PROPER_COMPILER_$1" |
| 54 |
- else |
| 55 |
- AC_MSG_RESULT([no, keeping $1]) |
| 56 |
+ # We can't handle ccache by gcc wrappers, since we need to know if we're |
| 57 |
+ # using ccache. Instead ccache usage must be controlled by a configure option. |
| 58 |
+ COMPILER_BASENAME=`$BASENAME "$SYMLINK_ORIGINAL"` |
| 59 |
+ if test "x$COMPILER_BASENAME" = "xccache"; then |
| 60 |
+ AC_MSG_NOTICE([Please use --enable-ccache instead of providing a wrapped compiler.]) |
| 61 |
+ AC_MSG_ERROR([$TEST_COMPILER is a symbolic link to ccache. This is not supported.]) |
| 62 |
+ fi |
| 63 |
fi |
| 64 |
|
| 65 |
TOOLCHAIN_CHECK_COMPILER_VERSION([$1], [$COMPILER_NAME]) |
Parent Directory
| 
Revision Log