diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-07-01 10:12:50 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-07-01 10:12:50 +0100 |
commit | 7c160dea5456b783d9b04b5c11bbacb9a89fa031 (patch) | |
tree | 129cafaaa738d080e0fa601af10b5a06ac920341 /perf/cairo-perf-diff | |
parent | 3d88f99668308315db759af3dac789973caa8eae (diff) | |
download | cairo-7c160dea5456b783d9b04b5c11bbacb9a89fa031.tar.gz |
[perf] Unbreak cairo-perf-diff builder
Diffstat (limited to 'perf/cairo-perf-diff')
-rwxr-xr-x | perf/cairo-perf-diff | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/perf/cairo-perf-diff b/perf/cairo-perf-diff index f1371110d..e695cfccf 100755 --- a/perf/cairo-perf-diff +++ b/perf/cairo-perf-diff @@ -154,6 +154,15 @@ build() { git checkout tmp-cairo-perf-diff git reset --hard $sha + if [ -z "$MAKEFLAGS" ]; then + CPU_COUNT=`cpu_count` + export MAKEFLAGS="-j`expr $CPU_COUNT + 1`" + fi + + if [ ! -e Makefile ]; then + ./autogen.sh $CAIRO_AUTOGEN_OPTIONS + fi + for file in $boilerplate_files; do rsync $CAIRO_DIR/$file boilerplate done @@ -164,16 +173,8 @@ build() { rsync $CAIRO_DIR/$file util/cairo-script done - if [ -z "$MAKEFLAGS" ]; then - CPU_COUNT=`cpu_count` - export MAKEFLAGS="-j`expr $CPU_COUNT + 1`" - fi - - if [ ! -e Makefile ]; then - ./autogen.sh $CAIRO_AUTOGEN_OPTIONS - fi make || (rm config.cache && make) - (cd boilerplate && make) + (cd boilerplate && make libcairoboilerplate.la) cd perf make cairo-perf cairo-perf-trace |