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
This commit is contained in:
parent
723b0501e2
commit
de5973b05b
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user