summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-22 22:59:15 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-22 22:59:15 +0000
commit620d23dbbb44586fadfe08f9cec5e0700b96de80 (patch)
tree1076c292cab59479a0312cc2c7dffd4b2eda5dfd /chrome/tools
parent30adea401601745b37a85276bbe9a418f6ad68c6 (diff)
downloadchromium_src-620d23dbbb44586fadfe08f9cec5e0700b96de80.zip
chromium_src-620d23dbbb44586fadfe08f9cec5e0700b96de80.tar.gz
chromium_src-620d23dbbb44586fadfe08f9cec5e0700b96de80.tar.bz2
Linux: Change the generic chrome-wrapper script to overwrite symlinks it creates.
BUG=30810 TEST=none Review URL: http://codereview.chromium.org/548113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rwxr-xr-xchrome/tools/build/linux/chrome-wrapper4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/tools/build/linux/chrome-wrapper b/chrome/tools/build/linux/chrome-wrapper
index e7ec420..7aeeb7a 100755
--- a/chrome/tools/build/linux/chrome-wrapper
+++ b/chrome/tools/build/linux/chrome-wrapper
@@ -94,7 +94,7 @@ if [ $? = 0 ]; then
if [ -e "$dir/libbz2.so.1" ]; then
LIB_ARCH=$(check_executable "$dir/libbz2.so.1")
if [ "$CHROME_ARCH" = "$LIB_ARCH" ]; then
- ln -s "$dir/libbz2.so.1" "$HERE/libbz2.so.1.0"
+ ln -snf "$dir/libbz2.so.1" "$HERE/libbz2.so.1.0"
break;
fi
fi
@@ -111,7 +111,7 @@ do
if [ -e "$dir/$reallib" ]; then
LIB_ARCH=$(check_executable "$dir/$reallib")
if [ "$CHROME_ARCH" = "$LIB_ARCH" ]; then
- ln -s "$dir/$reallib" "$HERE/$lib"
+ ln -snf "$dir/$reallib" "$HERE/$lib"
break;
fi
fi