summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-08-31 15:42:58 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-08-31 15:42:58 -0400
commit503c2aa9a30ed484d9f41b415af6ec0f9ca93353 (patch)
treeb23bfcb84a341f0ef0c45fb57207ff84841610b9
parent392bf44a1f28dfac7583aca551745fe8499e9fe8 (diff)
SL-957: Pass an absolute pathname to CMake for VIEWER_SYMBOL_FILE.
-rwxr-xr-xbuild.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index d6a6d7aca8..de7e474479 100755
--- a/build.sh
+++ b/build.sh
@@ -116,8 +116,10 @@ pre_build()
symplat="linux"
;;
esac
- # This name is consumed by indra/newview/CMakeLists.txt
- VIEWER_SYMBOL_FILE="$build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2"
+ # This name is consumed by indra/newview/CMakeLists.txt. Make it
+ # absolute because we've had troubles with relative pathnames.
+ abs_build_dir="$(cd "$build_dir"; pwd)"
+ VIEWER_SYMBOL_FILE="$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2"
fi
# don't spew credentials into build log