summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 10:58:00 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 10:58:00 +0000
commit803c45c5bc7bef985fd6b78351b98512cda39578 (patch)
treef6f5a3a4a405ac3935fcae5d2b1788e9cf87d1fe /build
parentccbca85d697e371d20d1e4c24860971dcd61a60a (diff)
downloadchromium_src-803c45c5bc7bef985fd6b78351b98512cda39578.zip
chromium_src-803c45c5bc7bef985fd6b78351b98512cda39578.tar.gz
chromium_src-803c45c5bc7bef985fd6b78351b98512cda39578.tar.bz2
Do not overwrite ld.orig in install-build-deps.sh.
TBR=dank BUG=none TEST=Install gold through install-build-deps.sh twice. /usr/bin/ld.orig should still be GNU ld. Review URL: http://codereview.chromium.org/402047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/install-build-deps.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index 0ce175e..c5092c6 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -82,7 +82,8 @@ __EOF__
# variables. That will go into bootstrap-linux.sh when it's ready.
echo "Installing gold as /usr/bin/ld."
echo "To uninstall, do 'cd /usr/bin; sudo rm ld; sudo mv ld.orig ld'"
- test -f /usr/bin/ld && sudo mv /usr/bin/ld /usr/bin/ld.orig
+ test -f /usr/bin/ld && test ! -f /usr/bin/ld.orig && \
+ sudo mv /usr/bin/ld /usr/bin/ld.orig
sudo strip /usr/local/gold/bin/ld
sudo ln -fs /usr/local/gold/bin/ld /usr/bin/ld.gold
sudo ln -fs /usr/bin/ld.gold /usr/bin/ld