Mercurial > jdk8-mips64-public / changeset
changeset
8014003: New build does not handle symlinks in workspace path
Fri, 31 May 2013 14:07:42 +0200
- author
- erikj
- date
- Fri, 31 May 2013 14:07:42 +0200
- changeset 726
- c31e9dc1fe3d
- parent 725
- 03e60e87d92a
- child 727
- 44259699e0b5
8014003: New build does not handle symlinks in workspace path
Reviewed-by: tbell
1.1 --- a/common/autoconf/basics.m4 Wed May 29 14:01:04 2013 +0200 1.2 +++ b/common/autoconf/basics.m4 Fri May 31 14:07:42 2013 +0200 1.3 @@ -72,7 +72,7 @@ 1.4 AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.]) 1.5 fi 1.6 1.7 - $1="`cd "$path"; $THEPWDCMD`" 1.8 + $1="`cd "$path"; $THEPWDCMD -L`" 1.9 fi 1.10 ]) 1.11 1.12 @@ -169,10 +169,10 @@ 1.13 COUNTER=0 1.14 sym_link_dir=`$DIRNAME [$]$1` 1.15 sym_link_file=`$BASENAME [$]$1` 1.16 - # Use the system pwd and not the shell builtin to resolve directory symlinks 1.17 cd $sym_link_dir 1.18 - cd `$THEPWDCMD` 1.19 - sym_link_dir=`$THEPWDCMD` 1.20 + # Use -P flag to resolve symlinks in directories. 1.21 + cd `$THEPWDCMD -P` 1.22 + sym_link_dir=`$THEPWDCMD -P` 1.23 # Resolve file symlinks 1.24 while test $COUNTER -lt 20; do 1.25 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 1.26 @@ -183,7 +183,7 @@ 1.27 # Again resolve directory symlinks since the target of the just found 1.28 # link could be in a different directory 1.29 cd `$DIRNAME $ISLINK` 1.30 - sym_link_dir=`$THEPWDCMD` 1.31 + sym_link_dir=`$THEPWDCMD -P` 1.32 sym_link_file=`$BASENAME $ISLINK` 1.33 let COUNTER=COUNTER+1 1.34 done 1.35 @@ -264,7 +264,6 @@ 1.36 BASIC_REQUIRE_PROG(MKTEMP, mktemp) 1.37 BASIC_REQUIRE_PROG(MV, mv) 1.38 BASIC_REQUIRE_PROG(PRINTF, printf) 1.39 -BASIC_REQUIRE_PROG(THEPWDCMD, pwd) 1.40 BASIC_REQUIRE_PROG(RM, rm) 1.41 BASIC_REQUIRE_PROG(SH, sh) 1.42 BASIC_REQUIRE_PROG(SORT, sort) 1.43 @@ -297,6 +296,10 @@ 1.44 # Always force rm. 1.45 RM="$RM -f" 1.46 1.47 +# pwd behaves differently on various platforms and some don't support the -L flag. 1.48 +# Always use the bash builtin pwd to get uniform behavior. 1.49 +THEPWDCMD=pwd 1.50 + 1.51 # These are not required on all platforms 1.52 AC_PATH_PROG(CYGPATH, cygpath) 1.53 AC_PATH_PROG(READLINK, readlink) 1.54 @@ -309,13 +312,12 @@ 1.55 [ 1.56 # Locate the directory of this script. 1.57 SCRIPT="[$]0" 1.58 -BASIC_REMOVE_SYMBOLIC_LINKS(SCRIPT) 1.59 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD` 1.60 +AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L` 1.61 1.62 # Where is the source? It is located two levels above the configure script. 1.63 CURDIR="$PWD" 1.64 cd "$AUTOCONF_DIR/../.." 1.65 -SRC_ROOT="`$THEPWDCMD`" 1.66 +SRC_ROOT="`$THEPWDCMD -L`" 1.67 1.68 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 1.69 PATH_SEP=";" 1.70 @@ -374,13 +376,9 @@ 1.71 [ CONF_NAME=${with_conf_name} ]) 1.72 1.73 # Test from where we are running configure, in or outside of src root. 1.74 -# To enable comparison of directories, CURDIR needs to be symlink free 1.75 -# just like SRC_ROOT already is 1.76 -NOSYM_CURDIR="$CURDIR" 1.77 -BASIC_REMOVE_SYMBOLIC_LINKS(NOSYM_CURDIR) 1.78 -if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \ 1.79 - || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \ 1.80 - || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 1.81 +if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \ 1.82 + || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \ 1.83 + || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 1.84 # We are running configure from the src root. 1.85 # Create a default ./build/target-variant-debuglevel output root. 1.86 if test "x${CONF_NAME}" = x; then
2.1 --- a/common/autoconf/basics_windows.m4 Wed May 29 14:01:04 2013 +0200 2.2 +++ b/common/autoconf/basics_windows.m4 Fri May 31 14:07:42 2013 +0200 2.3 @@ -300,7 +300,7 @@ 2.4 # Setup basic configuration paths, and platform-specific stuff related to PATHs. 2.5 AC_DEFUN([BASIC_CHECK_PATHS_WINDOWS], 2.6 [ 2.7 - SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m` 2.8 + SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m` 2.9 if test $SRC_ROOT_LENGTH -gt 100; then 2.10 AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported]) 2.11 fi
3.1 --- a/common/autoconf/generated-configure.sh Wed May 29 14:01:04 2013 +0200 3.2 +++ b/common/autoconf/generated-configure.sh Fri May 31 14:07:42 2013 +0200 3.3 @@ -901,7 +901,6 @@ 3.4 SORT 3.5 SH 3.6 RM 3.7 -THEPWDCMD 3.8 PRINTF 3.9 MV 3.10 MKTEMP 3.11 @@ -3781,7 +3780,7 @@ 3.12 #CUSTOM_AUTOCONF_INCLUDE 3.13 3.14 # Do not change or remove the following line, it is needed for consistency checks: 3.15 -DATE_WHEN_GENERATED=1369828849 3.16 +DATE_WHEN_GENERATED=1370001995 3.17 3.18 ############################################################################### 3.19 # 3.20 @@ -5170,65 +5169,6 @@ 3.21 3.22 3.23 3.24 - for ac_prog in pwd 3.25 -do 3.26 - # Extract the first word of "$ac_prog", so it can be a program name with args. 3.27 -set dummy $ac_prog; ac_word=$2 3.28 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.29 -$as_echo_n "checking for $ac_word... " >&6; } 3.30 -if test "${ac_cv_path_THEPWDCMD+set}" = set; then : 3.31 - $as_echo_n "(cached) " >&6 3.32 -else 3.33 - case $THEPWDCMD in 3.34 - [\\/]* | ?:[\\/]*) 3.35 - ac_cv_path_THEPWDCMD="$THEPWDCMD" # Let the user override the test with a path. 3.36 - ;; 3.37 - *) 3.38 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.39 -for as_dir in $PATH 3.40 -do 3.41 - IFS=$as_save_IFS 3.42 - test -z "$as_dir" && as_dir=. 3.43 - for ac_exec_ext in '' $ac_executable_extensions; do 3.44 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.45 - ac_cv_path_THEPWDCMD="$as_dir/$ac_word$ac_exec_ext" 3.46 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.47 - break 2 3.48 - fi 3.49 -done 3.50 - done 3.51 -IFS=$as_save_IFS 3.52 - 3.53 - ;; 3.54 -esac 3.55 -fi 3.56 -THEPWDCMD=$ac_cv_path_THEPWDCMD 3.57 -if test -n "$THEPWDCMD"; then 3.58 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THEPWDCMD" >&5 3.59 -$as_echo "$THEPWDCMD" >&6; } 3.60 -else 3.61 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.62 -$as_echo "no" >&6; } 3.63 -fi 3.64 - 3.65 - 3.66 - test -n "$THEPWDCMD" && break 3.67 -done 3.68 - 3.69 - 3.70 - if test "x$THEPWDCMD" = x; then 3.71 - if test "xpwd" = x; then 3.72 - PROG_NAME=thepwdcmd 3.73 - else 3.74 - PROG_NAME=pwd 3.75 - fi 3.76 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 3.77 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 3.78 - as_fn_error $? "Cannot continue" "$LINENO" 5 3.79 - fi 3.80 - 3.81 - 3.82 - 3.83 for ac_prog in rm 3.84 do 3.85 # Extract the first word of "$ac_prog", so it can be a program name with args. 3.86 @@ -6427,6 +6367,10 @@ 3.87 # Always force rm. 3.88 RM="$RM -f" 3.89 3.90 +# pwd behaves differently on various platforms and some don't support the -L flag. 3.91 +# Always use the bash builtin pwd to get uniform behavior. 3.92 +THEPWDCMD=pwd 3.93 + 3.94 # These are not required on all platforms 3.95 # Extract the first word of "cygpath", so it can be a program name with args. 3.96 set dummy cygpath; ac_word=$2 3.97 @@ -7134,65 +7078,17 @@ 3.98 3.99 # Locate the directory of this script. 3.100 SCRIPT="$0" 3.101 - 3.102 - if test "x$OPENJDK_BUILD_OS" != xwindows; then 3.103 - # Follow a chain of symbolic links. Use readlink 3.104 - # where it exists, else fall back to horribly 3.105 - # complicated shell code. 3.106 - if test "x$READLINK_TESTED" != yes; then 3.107 - # On MacOSX there is a readlink tool with a different 3.108 - # purpose than the GNU readlink tool. Check the found readlink. 3.109 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 3.110 - if test "x$ISGNU" = x; then 3.111 - # A readlink that we do not know how to use. 3.112 - # Are there other non-GNU readlinks out there? 3.113 - READLINK_TESTED=yes 3.114 - READLINK= 3.115 - fi 3.116 - fi 3.117 - 3.118 - if test "x$READLINK" != x; then 3.119 - SCRIPT=`$READLINK -f $SCRIPT` 3.120 - else 3.121 - # Save the current directory for restoring afterwards 3.122 - STARTDIR=$PWD 3.123 - COUNTER=0 3.124 - sym_link_dir=`$DIRNAME $SCRIPT` 3.125 - sym_link_file=`$BASENAME $SCRIPT` 3.126 - # Use the system pwd and not the shell builtin to resolve directory symlinks 3.127 - cd $sym_link_dir 3.128 - cd `$THEPWDCMD` 3.129 - sym_link_dir=`$THEPWDCMD` 3.130 - # Resolve file symlinks 3.131 - while test $COUNTER -lt 20; do 3.132 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.133 - if test "x$ISLINK" == x; then 3.134 - # This is not a symbolic link! We are done! 3.135 - break 3.136 - fi 3.137 - # Again resolve directory symlinks since the target of the just found 3.138 - # link could be in a different directory 3.139 - cd `$DIRNAME $ISLINK` 3.140 - sym_link_dir=`$THEPWDCMD` 3.141 - sym_link_file=`$BASENAME $ISLINK` 3.142 - let COUNTER=COUNTER+1 3.143 - done 3.144 - cd $STARTDIR 3.145 - SCRIPT=$sym_link_dir/$sym_link_file 3.146 - fi 3.147 - fi 3.148 - 3.149 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD` 3.150 +AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L` 3.151 3.152 # Where is the source? It is located two levels above the configure script. 3.153 CURDIR="$PWD" 3.154 cd "$AUTOCONF_DIR/../.." 3.155 -SRC_ROOT="`$THEPWDCMD`" 3.156 +SRC_ROOT="`$THEPWDCMD -L`" 3.157 3.158 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 3.159 PATH_SEP=";" 3.160 3.161 - SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m` 3.162 + SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m` 3.163 if test $SRC_ROOT_LENGTH -gt 100; then 3.164 as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5 3.165 fi 3.166 @@ -7408,7 +7304,7 @@ 3.167 as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 3.168 fi 3.169 3.170 - SRC_ROOT="`cd "$path"; $THEPWDCMD`" 3.171 + SRC_ROOT="`cd "$path"; $THEPWDCMD -L`" 3.172 fi 3.173 3.174 3.175 @@ -7530,7 +7426,7 @@ 3.176 as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5 3.177 fi 3.178 3.179 - CURDIR="`cd "$path"; $THEPWDCMD`" 3.180 + CURDIR="`cd "$path"; $THEPWDCMD -L`" 3.181 fi 3.182 3.183 3.184 @@ -7901,60 +7797,9 @@ 3.185 3.186 3.187 # Test from where we are running configure, in or outside of src root. 3.188 -# To enable comparison of directories, CURDIR needs to be symlink free 3.189 -# just like SRC_ROOT already is 3.190 -NOSYM_CURDIR="$CURDIR" 3.191 - 3.192 - if test "x$OPENJDK_BUILD_OS" != xwindows; then 3.193 - # Follow a chain of symbolic links. Use readlink 3.194 - # where it exists, else fall back to horribly 3.195 - # complicated shell code. 3.196 - if test "x$READLINK_TESTED" != yes; then 3.197 - # On MacOSX there is a readlink tool with a different 3.198 - # purpose than the GNU readlink tool. Check the found readlink. 3.199 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 3.200 - if test "x$ISGNU" = x; then 3.201 - # A readlink that we do not know how to use. 3.202 - # Are there other non-GNU readlinks out there? 3.203 - READLINK_TESTED=yes 3.204 - READLINK= 3.205 - fi 3.206 - fi 3.207 - 3.208 - if test "x$READLINK" != x; then 3.209 - NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR` 3.210 - else 3.211 - # Save the current directory for restoring afterwards 3.212 - STARTDIR=$PWD 3.213 - COUNTER=0 3.214 - sym_link_dir=`$DIRNAME $NOSYM_CURDIR` 3.215 - sym_link_file=`$BASENAME $NOSYM_CURDIR` 3.216 - # Use the system pwd and not the shell builtin to resolve directory symlinks 3.217 - cd $sym_link_dir 3.218 - cd `$THEPWDCMD` 3.219 - sym_link_dir=`$THEPWDCMD` 3.220 - # Resolve file symlinks 3.221 - while test $COUNTER -lt 20; do 3.222 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.223 - if test "x$ISLINK" == x; then 3.224 - # This is not a symbolic link! We are done! 3.225 - break 3.226 - fi 3.227 - # Again resolve directory symlinks since the target of the just found 3.228 - # link could be in a different directory 3.229 - cd `$DIRNAME $ISLINK` 3.230 - sym_link_dir=`$THEPWDCMD` 3.231 - sym_link_file=`$BASENAME $ISLINK` 3.232 - let COUNTER=COUNTER+1 3.233 - done 3.234 - cd $STARTDIR 3.235 - NOSYM_CURDIR=$sym_link_dir/$sym_link_file 3.236 - fi 3.237 - fi 3.238 - 3.239 -if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \ 3.240 - || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \ 3.241 - || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 3.242 +if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \ 3.243 + || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \ 3.244 + || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 3.245 # We are running configure from the src root. 3.246 # Create a default ./build/target-variant-debuglevel output root. 3.247 if test "x${CONF_NAME}" = x; then 3.248 @@ -8129,7 +7974,7 @@ 3.249 as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 3.250 fi 3.251 3.252 - OUTPUT_ROOT="`cd "$path"; $THEPWDCMD`" 3.253 + OUTPUT_ROOT="`cd "$path"; $THEPWDCMD -L`" 3.254 fi 3.255 3.256 3.257 @@ -11245,7 +11090,7 @@ 3.258 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.259 fi 3.260 3.261 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.262 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.263 fi 3.264 3.265 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.266 @@ -11577,7 +11422,7 @@ 3.267 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.268 fi 3.269 3.270 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.271 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.272 fi 3.273 3.274 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.275 @@ -11723,7 +11568,7 @@ 3.276 as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5 3.277 fi 3.278 3.279 - JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD`" 3.280 + JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`" 3.281 fi 3.282 3.283 if test ! -d "$JAVA_HOME_PROCESSED"; then 3.284 @@ -11895,7 +11740,7 @@ 3.285 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.286 fi 3.287 3.288 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.289 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.290 fi 3.291 3.292 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.293 @@ -12083,7 +11928,7 @@ 3.294 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.295 fi 3.296 3.297 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.298 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.299 fi 3.300 3.301 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.302 @@ -12222,10 +12067,10 @@ 3.303 COUNTER=0 3.304 sym_link_dir=`$DIRNAME $BINARY` 3.305 sym_link_file=`$BASENAME $BINARY` 3.306 - # Use the system pwd and not the shell builtin to resolve directory symlinks 3.307 cd $sym_link_dir 3.308 - cd `$THEPWDCMD` 3.309 - sym_link_dir=`$THEPWDCMD` 3.310 + # Use -P flag to resolve symlinks in directories. 3.311 + cd `$THEPWDCMD -P` 3.312 + sym_link_dir=`$THEPWDCMD -P` 3.313 # Resolve file symlinks 3.314 while test $COUNTER -lt 20; do 3.315 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.316 @@ -12236,7 +12081,7 @@ 3.317 # Again resolve directory symlinks since the target of the just found 3.318 # link could be in a different directory 3.319 cd `$DIRNAME $ISLINK` 3.320 - sym_link_dir=`$THEPWDCMD` 3.321 + sym_link_dir=`$THEPWDCMD -P` 3.322 sym_link_file=`$BASENAME $ISLINK` 3.323 let COUNTER=COUNTER+1 3.324 done 3.325 @@ -12411,7 +12256,7 @@ 3.326 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.327 fi 3.328 3.329 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.330 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.331 fi 3.332 3.333 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.334 @@ -12626,7 +12471,7 @@ 3.335 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.336 fi 3.337 3.338 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.339 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.340 fi 3.341 3.342 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.343 @@ -12806,7 +12651,7 @@ 3.344 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.345 fi 3.346 3.347 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.348 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.349 fi 3.350 3.351 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.352 @@ -13014,7 +12859,7 @@ 3.353 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.354 fi 3.355 3.356 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.357 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.358 fi 3.359 3.360 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.361 @@ -13194,7 +13039,7 @@ 3.362 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.363 fi 3.364 3.365 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.366 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.367 fi 3.368 3.369 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.370 @@ -13402,7 +13247,7 @@ 3.371 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.372 fi 3.373 3.374 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.375 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.376 fi 3.377 3.378 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.379 @@ -13582,7 +13427,7 @@ 3.380 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.381 fi 3.382 3.383 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.384 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.385 fi 3.386 3.387 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.388 @@ -13790,7 +13635,7 @@ 3.389 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.390 fi 3.391 3.392 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.393 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.394 fi 3.395 3.396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.397 @@ -13970,7 +13815,7 @@ 3.398 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.399 fi 3.400 3.401 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.402 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.403 fi 3.404 3.405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.406 @@ -14165,7 +14010,7 @@ 3.407 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.408 fi 3.409 3.410 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.411 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.412 fi 3.413 3.414 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.415 @@ -14343,7 +14188,7 @@ 3.416 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.417 fi 3.418 3.419 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.420 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.421 fi 3.422 3.423 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.424 @@ -14539,7 +14384,7 @@ 3.425 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.426 fi 3.427 3.428 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.429 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.430 fi 3.431 3.432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.433 @@ -14717,7 +14562,7 @@ 3.434 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.435 fi 3.436 3.437 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.438 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.439 fi 3.440 3.441 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.442 @@ -14912,7 +14757,7 @@ 3.443 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.444 fi 3.445 3.446 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.447 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.448 fi 3.449 3.450 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.451 @@ -15090,7 +14935,7 @@ 3.452 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.453 fi 3.454 3.455 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.456 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.457 fi 3.458 3.459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.460 @@ -15286,7 +15131,7 @@ 3.461 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.462 fi 3.463 3.464 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.465 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.466 fi 3.467 3.468 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.469 @@ -15464,7 +15309,7 @@ 3.470 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.471 fi 3.472 3.473 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.474 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.475 fi 3.476 3.477 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.478 @@ -15641,7 +15486,7 @@ 3.479 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.480 fi 3.481 3.482 - BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.483 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`" 3.484 fi 3.485 3.486 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.487 @@ -16445,7 +16290,7 @@ 3.488 as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5 3.489 fi 3.490 3.491 - JT_HOME="`cd "$path"; $THEPWDCMD`" 3.492 + JT_HOME="`cd "$path"; $THEPWDCMD -L`" 3.493 fi 3.494 3.495 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JT_HOME" >&5 3.496 @@ -17434,7 +17279,7 @@ 3.497 as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5 3.498 fi 3.499 3.500 - MSVCR_DLL="`cd "$path"; $THEPWDCMD`" 3.501 + MSVCR_DLL="`cd "$path"; $THEPWDCMD -L`" 3.502 fi 3.503 3.504 3.505 @@ -17591,7 +17436,7 @@ 3.506 as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5 3.507 fi 3.508 3.509 - dxsdk_path="`cd "$path"; $THEPWDCMD`" 3.510 + dxsdk_path="`cd "$path"; $THEPWDCMD -L`" 3.511 fi 3.512 3.513 3.514 @@ -17729,7 +17574,7 @@ 3.515 as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 3.516 fi 3.517 3.518 - DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD`" 3.519 + DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD -L`" 3.520 fi 3.521 3.522 3.523 @@ -17865,7 +17710,7 @@ 3.524 as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 3.525 fi 3.526 3.527 - DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD`" 3.528 + DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`" 3.529 fi 3.530 3.531 3.532 @@ -19452,10 +19297,10 @@ 3.533 COUNTER=0 3.534 sym_link_dir=`$DIRNAME $TEST_COMPILER` 3.535 sym_link_file=`$BASENAME $TEST_COMPILER` 3.536 - # Use the system pwd and not the shell builtin to resolve directory symlinks 3.537 cd $sym_link_dir 3.538 - cd `$THEPWDCMD` 3.539 - sym_link_dir=`$THEPWDCMD` 3.540 + # Use -P flag to resolve symlinks in directories. 3.541 + cd `$THEPWDCMD -P` 3.542 + sym_link_dir=`$THEPWDCMD -P` 3.543 # Resolve file symlinks 3.544 while test $COUNTER -lt 20; do 3.545 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.546 @@ -19466,7 +19311,7 @@ 3.547 # Again resolve directory symlinks since the target of the just found 3.548 # link could be in a different directory 3.549 cd `$DIRNAME $ISLINK` 3.550 - sym_link_dir=`$THEPWDCMD` 3.551 + sym_link_dir=`$THEPWDCMD -P` 3.552 sym_link_file=`$BASENAME $ISLINK` 3.553 let COUNTER=COUNTER+1 3.554 done 3.555 @@ -19889,10 +19734,10 @@ 3.556 COUNTER=0 3.557 sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC` 3.558 sym_link_file=`$BASENAME $PROPER_COMPILER_CC` 3.559 - # Use the system pwd and not the shell builtin to resolve directory symlinks 3.560 cd $sym_link_dir 3.561 - cd `$THEPWDCMD` 3.562 - sym_link_dir=`$THEPWDCMD` 3.563 + # Use -P flag to resolve symlinks in directories. 3.564 + cd `$THEPWDCMD -P` 3.565 + sym_link_dir=`$THEPWDCMD -P` 3.566 # Resolve file symlinks 3.567 while test $COUNTER -lt 20; do 3.568 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.569 @@ -19903,7 +19748,7 @@ 3.570 # Again resolve directory symlinks since the target of the just found 3.571 # link could be in a different directory 3.572 cd `$DIRNAME $ISLINK` 3.573 - sym_link_dir=`$THEPWDCMD` 3.574 + sym_link_dir=`$THEPWDCMD -P` 3.575 sym_link_file=`$BASENAME $ISLINK` 3.576 let COUNTER=COUNTER+1 3.577 done 3.578 @@ -21025,10 +20870,10 @@ 3.579 COUNTER=0 3.580 sym_link_dir=`$DIRNAME $TEST_COMPILER` 3.581 sym_link_file=`$BASENAME $TEST_COMPILER` 3.582 - # Use the system pwd and not the shell builtin to resolve directory symlinks 3.583 cd $sym_link_dir 3.584 - cd `$THEPWDCMD` 3.585 - sym_link_dir=`$THEPWDCMD` 3.586 + # Use -P flag to resolve symlinks in directories. 3.587 + cd `$THEPWDCMD -P` 3.588 + sym_link_dir=`$THEPWDCMD -P` 3.589 # Resolve file symlinks 3.590 while test $COUNTER -lt 20; do 3.591 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.592 @@ -21039,7 +20884,7 @@ 3.593 # Again resolve directory symlinks since the target of the just found 3.594 # link could be in a different directory 3.595 cd `$DIRNAME $ISLINK` 3.596 - sym_link_dir=`$THEPWDCMD` 3.597 + sym_link_dir=`$THEPWDCMD -P` 3.598 sym_link_file=`$BASENAME $ISLINK` 3.599 let COUNTER=COUNTER+1 3.600 done 3.601 @@ -21462,10 +21307,10 @@ 3.602 COUNTER=0 3.603 sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX` 3.604 sym_link_file=`$BASENAME $PROPER_COMPILER_CXX` 3.605 - # Use the system pwd and not the shell builtin to resolve directory symlinks 3.606 cd $sym_link_dir 3.607 - cd `$THEPWDCMD` 3.608 - sym_link_dir=`$THEPWDCMD` 3.609 + # Use -P flag to resolve symlinks in directories. 3.610 + cd `$THEPWDCMD -P` 3.611 + sym_link_dir=`$THEPWDCMD -P` 3.612 # Resolve file symlinks 3.613 while test $COUNTER -lt 20; do 3.614 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.615 @@ -21476,7 +21321,7 @@ 3.616 # Again resolve directory symlinks since the target of the just found 3.617 # link could be in a different directory 3.618 cd `$DIRNAME $ISLINK` 3.619 - sym_link_dir=`$THEPWDCMD` 3.620 + sym_link_dir=`$THEPWDCMD -P` 3.621 sym_link_file=`$BASENAME $ISLINK` 3.622 let COUNTER=COUNTER+1 3.623 done 3.624 @@ -31188,7 +31033,7 @@ 3.625 as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5 3.626 fi 3.627 3.628 - with_freetype="`cd "$path"; $THEPWDCMD`" 3.629 + with_freetype="`cd "$path"; $THEPWDCMD -L`" 3.630 fi 3.631 3.632 FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype" 3.633 @@ -31490,7 +31335,7 @@ 3.634 as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5 3.635 fi 3.636 3.637 - FREETYPELOCATION="`cd "$path"; $THEPWDCMD`" 3.638 + FREETYPELOCATION="`cd "$path"; $THEPWDCMD -L`" 3.639 fi 3.640 3.641 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
