From de5973b05be6ecc80309cded8541f9c305135d15 Mon Sep 17 00:00:00 2001
From: mtklein <mtklein@chromium.org>
Date: Tue, 15 Sep 2015 10:17:08 -0700
Subject: [PATCH] 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
---
 cmake/cmake_build | 9 ++-------
 1 file 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"