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

2014-09-12 16:36:20 +00:00 · 2014-09-12 16:36:20 +00:00 · 0c837a093e
parent aaaf5025b6 a5c4f178ae
commit 0c837a093e
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