summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authordank@chromium.org <dank@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 22:27:07 +0000
committerdank@chromium.org <dank@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 22:27:07 +0000
commit932b5df1d141bf8fea625408c6a643a7fea8ed2a (patch)
tree86e3b965a44465b383d75de984deee26076dfba0 /tools
parent66d6d400d539f526671920968970d02c03f70148 (diff)
downloadchromium_src-932b5df1d141bf8fea625408c6a643a7fea8ed2a.zip
chromium_src-932b5df1d141bf8fea625408c6a643a7fea8ed2a.tar.gz
chromium_src-932b5df1d141bf8fea625408c6a643a7fea8ed2a.tar.bz2
Don't use -j4 to build gdb, it seems unsafe on mac.
Also don't install anything until everything is built. Review URL: http://codereview.chromium.org/262012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/valgrind/build-valgrind-for-chromium.sh23
1 files changed, 14 insertions, 9 deletions
diff --git a/tools/valgrind/build-valgrind-for-chromium.sh b/tools/valgrind/build-valgrind-for-chromium.sh
index 62047c0..3cd11b5 100755
--- a/tools/valgrind/build-valgrind-for-chromium.sh
+++ b/tools/valgrind/build-valgrind-for-chromium.sh
@@ -167,26 +167,31 @@ then
test -d "${OVERRIDE_LD_DIR}" && rm -rf "${OVERRIDE_LD_DIR}"
- # Don't use sudo if we own the destination
- if test -w "${parent_of_prefix}"
- then
- make install
- else
- sudo make install
- fi
-
+ # Build and install gdb if needed
case `uname` in
Darwin)
cd gdb-1344/src
./configure --prefix="${PREFIX}"
- make -j4
+ # gdb makefile is not yet parallel-safe
+ make
if test -w "${parent_of_prefix}"
then
make install
else
sudo make install
fi
+ cd ../..
;;
esac
+
+ # Finally install valgrind.
+ # Don't use sudo if we own the destination
+ if test -w "${parent_of_prefix}"
+ then
+ make install
+ else
+ sudo make install
+ fi
+
cd ..
fi