diff options
-rwxr-xr-x | screwdriver/build-vespa.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh index a0e205d2597..61e5553cd37 100755 --- a/screwdriver/build-vespa.sh +++ b/screwdriver/build-vespa.sh @@ -21,6 +21,16 @@ if ! source $SOURCE_DIR/screwdriver/detect-what-to-build.sh; then SHOULD_BUILD=systemtest fi +build_cpp(source_dir) { + cat /proc/cpuinfo | grep "model name" | head -1 + cat /proc/cpuinfo | grep "flags" | head -1 + # TODO This will only build for x86_64 architecture, and is used for pull request builds. + cmake3 -DVESPA_UNPRIVILEGED=no -DDEFAULT_VESPA_CPU_ARCH_FLAGS="-march=skylake" $source_dir + time make -j ${NUM_THREADS} + time ctest3 --output-on-failure -j ${NUM_THREADS} + ccache --show-stats +} + echo "Building: $SHOULD_BUILD" cd ${SOURCE_DIR} @@ -28,10 +38,7 @@ cd ${SOURCE_DIR} case $SHOULD_BUILD in cpp) ./bootstrap.sh full - cmake3 -DVESPA_UNPRIVILEGED=no . - time make -j ${NUM_THREADS} - time ctest3 --output-on-failure -j ${NUM_THREADS} - ccache --show-stats + build_cpp . ;; java) ./bootstrap.sh java @@ -44,10 +51,7 @@ case $SHOULD_BUILD in make -C client/go install-all ./bootstrap.sh java time mvn -V $VESPA_MAVEN_EXTRA_OPTS install - cmake3 -DVESPA_UNPRIVILEGED=no . - time make -j ${NUM_THREADS} - time ctest3 --output-on-failure -j ${NUM_THREADS} - ccache --show-stats + build_cpp . make install ;; esac |