am 0c837a09: Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev

* commit '0c837a093e9c6952885ef370a34b82213f12300c': Fix mma/mmma by making gettop canonicalize TOP when set
2014-09-12 18:53:26 +00:00
parent f69ff0e07f 0c837a093e
commit 16b5cd832f
1 changed files with 2 additions and 1 deletions
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -628,7 +628,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