diff options
| author | Colin Cross <ccross@android.com> | 2017-10-05 10:30:08 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-10-05 10:33:27 -0700 |
| commit | 4c1e9bbe664e532f83b258e6c8a214b0241530d8 (patch) | |
| tree | 621e80ecbe7aea74f5ce1741a1fcefbff3958bf6 | |
| parent | 9ed4361f4a6024bc04af8aaeb4c08f106012e454 (diff) | |
| download | jdk9-main.tar.gz | |
The emulated readlink loop used on darwin builds was using
ls -l outdir | grep '\->' to detect if outdir is a symlink.
This has a false positive if outdir is not a symlink but
contains one or more symlinks, which is how the Android
builds deal with merging an hg forest into non-nested git
projects. The false positive results in CANONICAL_TOPDIR
being set to a list of files and invalid make syntax
inserted into the generated spec.gmk file:
../build/macosx-x86_64-normal-server-release/spec.gmk:133: *** missing separator. Stop.
Test: toolchain/jdk/build/build-openjdk-darwin.sh --version=9 gets further
Change-Id: I36fa53bcaee1cfc348e67c829623a1d0e2384a6c
| -rw-r--r-- | common/autoconf/generated-configure.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index ab0642a..1781c48 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -16802,7 +16802,7 @@ $as_echo "$as_me: The path of TOPDIR, which resolves as \"$path\", is invalid." sym_link_dir=`$THEPWDCMD -P` # Resolve file symlinks while test $COUNTER -lt 20; do - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` + ISLINK=`$LS -ld $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` if test "x$ISLINK" == x; then # This is not a symbolic link! We are done! break |