From 543d4568d582742ab036495af09222471e5e54ce Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 29 Oct 2014 23:58:22 -0400 Subject: [PATCH] more build concurrency --- scripts/travis_before_install.sh | 2 +- scripts/travis_script.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 7c308d580..0cf21e0fe 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -40,7 +40,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then echo $CXXFLAGS echo $CFLAGS echo $LDFLAGS - make && sudo make install && \ + make -j$(nproc) && sudo make install && \ cd ../ mapbox_time "install_opengl" \ diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index f306dbcb7..8e2f92163 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -8,10 +8,10 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # build & test Linux # mapbox_time "compile_program" \ - make linux -j4 BUILDTYPE=${BUILDTYPE} + make linux -j$(nproc) BUILDTYPE=${BUILDTYPE} mapbox_time "compile_tests" \ - make test -j4 BUILDTYPE=${BUILDTYPE} + make test -j$(nproc) BUILDTYPE=${BUILDTYPE} mapbox_time "run_tests" \ ./scripts/run_tests.sh