| commit | c3aeddd331a62ebe7a4d6d6e5892cbe35222d6e7 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Sep 12 22:18:11 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Sep 12 22:18:11 2014 +0000 |
| tree | bf794e772dbf5ce51cb73b7764952abade49d199 | |
| parent | 1feb478d28cfb427650e4cd2752bcd988b3258e6 [diff] | |
| parent | 0ff3aba580eee692703fa0e204707386c114011f [diff] |
Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
diff --git a/envsetup.sh b/envsetup.sh index 2bba626..aa20380 100644 --- a/envsetup.sh +++ b/envsetup.sh
@@ -606,7 +606,8 @@ { 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