aboutsummaryrefslogtreecommitdiffhomepage
path: root/cmake/cmake_build
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-09-15 10:17:08 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-09-15 10:17:08 -0700
commitde5973b05be6ecc80309cded8541f9c305135d15 (patch)
tree979c5e8569d3e3c0a661a52d4d6e716ebf45eaa1 /cmake/cmake_build
parent723b0501e22373bb3e6c306daaceae02cda8a124 (diff)
small tweaks to cmake_build
- streamline how we define $here - only make `cmake` when bootstrapping; it's a little less to build BUG=skia:4269 CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Mac10.9-Clang-x86_64-Release-CMake-Trybot,Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot Review URL: https://codereview.chromium.org/1345663004
Diffstat (limited to 'cmake/cmake_build')
-rwxr-xr-xcmake/cmake_build9
1 files changed, 2 insertions, 7 deletions
diff --git a/cmake/cmake_build b/cmake/cmake_build
index 72785199f8..861453e434 100755
--- a/cmake/cmake_build
+++ b/cmake/cmake_build
@@ -10,12 +10,7 @@
set -e
set -x
-fulldir() {
- cd `dirname $1`
- echo `pwd`
-}
-
-here=`fulldir $0`
+here=$(cd `dirname $0`; echo `pwd`)
cores=32
if [[ -z "$BUILDTYPE" || -z "$SKIA_OUT" ]]; then
@@ -27,7 +22,7 @@ fi
echo "Bootstrapping CMake"
pushd $here/../third_party/externals/cmake
./bootstrap --parallel=$cores
-make -j $cores
+make -j $cores cmake
popd
echo "Building with bootstrapped CMake"