1.1 --- a/common/autoconf/generated-configure.sh Tue Jan 14 10:25:22 2014 -0800
1.2 +++ b/common/autoconf/generated-configure.sh Wed Jun 20 07:50:27 2018 -0700
1.3 @@ -4330,7 +4330,7 @@
1.4 #CUSTOM_AUTOCONF_INCLUDE
1.5
1.6 # Do not change or remove the following line, it is needed for consistency checks:
1.7 -DATE_WHEN_GENERATED=1528448223
1.8 +DATE_WHEN_GENERATED=1529506170
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -27230,12 +27230,10 @@
1.13 fi
1.14
1.15 TEST_COMPILER="$CC"
1.16 - # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
1.17 - # to 'xlc' but it is crucial that we invoke the compiler with the right name!
1.18 - if test "x$OPENJDK_BUILD_OS" != xaix; then
1.19 - # FIXME: This test should not be needed anymore; we don't do that for any platform.
1.20 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5
1.21 +
1.22 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5
1.23 $as_echo_n "checking resolved symbolic links for CC... " >&6; }
1.24 + SYMLINK_ORIGINAL="$TEST_COMPILER"
1.25
1.26 if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.27 # Follow a chain of symbolic links. Use readlink
1.28 @@ -27254,13 +27252,13 @@
1.29 fi
1.30
1.31 if test "x$READLINK" != x; then
1.32 - TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
1.33 + SYMLINK_ORIGINAL=`$READLINK -f $SYMLINK_ORIGINAL`
1.34 else
1.35 # Save the current directory for restoring afterwards
1.36 STARTDIR=$PWD
1.37 COUNTER=0
1.38 - sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.39 - sym_link_file=`$BASENAME $TEST_COMPILER`
1.40 + sym_link_dir=`$DIRNAME $SYMLINK_ORIGINAL`
1.41 + sym_link_file=`$BASENAME $SYMLINK_ORIGINAL`
1.42 cd $sym_link_dir
1.43 # Use -P flag to resolve symlinks in directories.
1.44 cd `$THEPWDCMD -P`
1.45 @@ -27280,31 +27278,32 @@
1.46 let COUNTER=COUNTER+1
1.47 done
1.48 cd $STARTDIR
1.49 - TEST_COMPILER=$sym_link_dir/$sym_link_file
1.50 - fi
1.51 - fi
1.52 -
1.53 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
1.54 -$as_echo "$TEST_COMPILER" >&6; }
1.55 - fi
1.56 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CC is disguised ccache" >&5
1.57 + SYMLINK_ORIGINAL=$sym_link_dir/$sym_link_file
1.58 + fi
1.59 + fi
1.60 +
1.61 + if test "x$TEST_COMPILER" = "x$SYMLINK_ORIGINAL"; then
1.62 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no symlink" >&5
1.63 +$as_echo "no symlink" >&6; }
1.64 + else
1.65 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMLINK_ORIGINAL" >&5
1.66 +$as_echo "$SYMLINK_ORIGINAL" >&6; }
1.67 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CC is disguised ccache" >&5
1.68 $as_echo_n "checking if CC is disguised ccache... " >&6; }
1.69 -
1.70 - COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
1.71 - if test "x$COMPILER_BASENAME" = "xccache"; then
1.72 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, trying to find proper $COMPILER_NAME compiler" >&5
1.73 + COMPILER_BASENAME=`$BASENAME "$SYMLINK_ORIGINAL"`
1.74 + if test "x$COMPILER_BASENAME" = "xccache"; then
1.75 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, trying to find proper $COMPILER_NAME compiler" >&5
1.76 $as_echo "yes, trying to find proper $COMPILER_NAME compiler" >&6; }
1.77 - # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
1.78 - # We want to control ccache invocation ourselves, so ignore this cc and try
1.79 - # searching again.
1.80 -
1.81 - # Remove the path to the fake ccache cc from the PATH
1.82 - RETRY_COMPILER_SAVED_PATH="$PATH"
1.83 - COMPILER_DIRNAME=`$DIRNAME $CC`
1.84 - PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
1.85 -
1.86 - # Try again looking for our compiler
1.87 - if test -n "$ac_tool_prefix"; then
1.88 + # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
1.89 + # We want to control ccache invocation ourselves, so ignore this cc and try
1.90 + # searching again.
1.91 +
1.92 + # Remove the path to the fake ccache cc from the PATH
1.93 + RETRY_COMPILER_SAVED_PATH="$PATH"
1.94 + COMPILER_DIRNAME=`$DIRNAME $CC`
1.95 + PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
1.96 + # Try again looking for our compiler
1.97 + if test -n "$ac_tool_prefix"; then
1.98 for ac_prog in $TOOLCHAIN_CC_BINARY
1.99 do
1.100 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.101 @@ -27686,9 +27685,9 @@
1.102 $as_echo "$as_me: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&6;}
1.103 fi
1.104
1.105 - PATH="$RETRY_COMPILER_SAVED_PATH"
1.106 -
1.107 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolved symbolic links for CC" >&5
1.108 + PATH="$RETRY_COMPILER_SAVED_PATH"
1.109 +
1.110 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolved symbolic links for CC" >&5
1.111 $as_echo_n "checking for resolved symbolic links for CC... " >&6; }
1.112
1.113 if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.114 @@ -27738,13 +27737,13 @@
1.115 fi
1.116 fi
1.117
1.118 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CC" >&5
1.119 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CC" >&5
1.120 $as_echo "$PROPER_COMPILER_CC" >&6; }
1.121 - CC="$PROPER_COMPILER_CC"
1.122 - else
1.123 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, keeping CC" >&5
1.124 + CC="$PROPER_COMPILER_CC"
1.125 + else
1.126 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, keeping CC" >&5
1.127 $as_echo "no, keeping CC" >&6; }
1.128 - CC="$TEST_COMPILER"
1.129 + fi
1.130 fi
1.131
1.132
1.133 @@ -28972,12 +28971,10 @@
1.134 fi
1.135
1.136 TEST_COMPILER="$CXX"
1.137 - # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
1.138 - # to 'xlc' but it is crucial that we invoke the compiler with the right name!
1.139 - if test "x$OPENJDK_BUILD_OS" != xaix; then
1.140 - # FIXME: This test should not be needed anymore; we don't do that for any platform.
1.141 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5
1.142 +
1.143 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5
1.144 $as_echo_n "checking resolved symbolic links for CXX... " >&6; }
1.145 + SYMLINK_ORIGINAL="$TEST_COMPILER"
1.146
1.147 if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.148 # Follow a chain of symbolic links. Use readlink
1.149 @@ -28996,13 +28993,13 @@
1.150 fi
1.151
1.152 if test "x$READLINK" != x; then
1.153 - TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
1.154 + SYMLINK_ORIGINAL=`$READLINK -f $SYMLINK_ORIGINAL`
1.155 else
1.156 # Save the current directory for restoring afterwards
1.157 STARTDIR=$PWD
1.158 COUNTER=0
1.159 - sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.160 - sym_link_file=`$BASENAME $TEST_COMPILER`
1.161 + sym_link_dir=`$DIRNAME $SYMLINK_ORIGINAL`
1.162 + sym_link_file=`$BASENAME $SYMLINK_ORIGINAL`
1.163 cd $sym_link_dir
1.164 # Use -P flag to resolve symlinks in directories.
1.165 cd `$THEPWDCMD -P`
1.166 @@ -29022,31 +29019,32 @@
1.167 let COUNTER=COUNTER+1
1.168 done
1.169 cd $STARTDIR
1.170 - TEST_COMPILER=$sym_link_dir/$sym_link_file
1.171 - fi
1.172 - fi
1.173 -
1.174 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
1.175 -$as_echo "$TEST_COMPILER" >&6; }
1.176 - fi
1.177 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CXX is disguised ccache" >&5
1.178 + SYMLINK_ORIGINAL=$sym_link_dir/$sym_link_file
1.179 + fi
1.180 + fi
1.181 +
1.182 + if test "x$TEST_COMPILER" = "x$SYMLINK_ORIGINAL"; then
1.183 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no symlink" >&5
1.184 +$as_echo "no symlink" >&6; }
1.185 + else
1.186 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMLINK_ORIGINAL" >&5
1.187 +$as_echo "$SYMLINK_ORIGINAL" >&6; }
1.188 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CXX is disguised ccache" >&5
1.189 $as_echo_n "checking if CXX is disguised ccache... " >&6; }
1.190 -
1.191 - COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
1.192 - if test "x$COMPILER_BASENAME" = "xccache"; then
1.193 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, trying to find proper $COMPILER_NAME compiler" >&5
1.194 + COMPILER_BASENAME=`$BASENAME "$SYMLINK_ORIGINAL"`
1.195 + if test "x$COMPILER_BASENAME" = "xccache"; then
1.196 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, trying to find proper $COMPILER_NAME compiler" >&5
1.197 $as_echo "yes, trying to find proper $COMPILER_NAME compiler" >&6; }
1.198 - # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
1.199 - # We want to control ccache invocation ourselves, so ignore this cc and try
1.200 - # searching again.
1.201 -
1.202 - # Remove the path to the fake ccache cc from the PATH
1.203 - RETRY_COMPILER_SAVED_PATH="$PATH"
1.204 - COMPILER_DIRNAME=`$DIRNAME $CXX`
1.205 - PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
1.206 -
1.207 - # Try again looking for our compiler
1.208 - if test -n "$ac_tool_prefix"; then
1.209 + # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
1.210 + # We want to control ccache invocation ourselves, so ignore this cc and try
1.211 + # searching again.
1.212 +
1.213 + # Remove the path to the fake ccache cc from the PATH
1.214 + RETRY_COMPILER_SAVED_PATH="$PATH"
1.215 + COMPILER_DIRNAME=`$DIRNAME $CXX`
1.216 + PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
1.217 + # Try again looking for our compiler
1.218 + if test -n "$ac_tool_prefix"; then
1.219 for ac_prog in $TOOLCHAIN_CXX_BINARY
1.220 do
1.221 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.222 @@ -29428,9 +29426,9 @@
1.223 $as_echo "$as_me: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&6;}
1.224 fi
1.225
1.226 - PATH="$RETRY_COMPILER_SAVED_PATH"
1.227 -
1.228 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolved symbolic links for CXX" >&5
1.229 + PATH="$RETRY_COMPILER_SAVED_PATH"
1.230 +
1.231 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolved symbolic links for CXX" >&5
1.232 $as_echo_n "checking for resolved symbolic links for CXX... " >&6; }
1.233
1.234 if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.235 @@ -29480,13 +29478,13 @@
1.236 fi
1.237 fi
1.238
1.239 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CXX" >&5
1.240 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CXX" >&5
1.241 $as_echo "$PROPER_COMPILER_CXX" >&6; }
1.242 - CXX="$PROPER_COMPILER_CXX"
1.243 - else
1.244 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, keeping CXX" >&5
1.245 + CXX="$PROPER_COMPILER_CXX"
1.246 + else
1.247 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, keeping CXX" >&5
1.248 $as_echo "no, keeping CXX" >&6; }
1.249 - CXX="$TEST_COMPILER"
1.250 + fi
1.251 fi
1.252
1.253
