diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-09-12 00:33:25 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-09-12 09:37:25 -0700 |
| commit | 0ff3aba580eee692703fa0e204707386c114011f (patch) | |
| tree | bf794e772dbf5ce51cb73b7764952abade49d199 | |
| parent | 1feb478d28cfb427650e4cd2752bcd988b3258e6 (diff) | |
| download | build-0ff3aba580eee692703fa0e204707386c114011f.zip build-0ff3aba580eee692703fa0e204707386c114011f.tar.gz build-0ff3aba580eee692703fa0e204707386c114011f.tar.bz2 | |
Fix mma/mmma by making gettop canonicalize TOP when set
Bug: 17253957
(cherry picked from commit a5c4f178ae3f3e94b1d1dceae3cc8d3196633c4a)
Change-Id: Id5f5a6e9c81d4332ef5a846423ea41384a053db6
| -rw-r--r-- | envsetup.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/envsetup.sh b/envsetup.sh index 2bba626..aa20380 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -606,7 +606,8 @@ function gettop { local TOPFILE=build/core/envsetup.mk if [ -n "$TOP" -a -f "$TOP/$TOPFILE" ] ; then - echo $TOP + # The following circumlocution ensures we remove symlinks from TOP. + (cd $TOP; PWD= /bin/pwd) else if [ -f $TOPFILE ] ; then # The following circumlocution (repeated below as well) ensures |