summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-10-16 16:31:51 +0200
committerGitHub <noreply@github.com>2023-10-16 16:31:51 +0200
commit25d1b91aa42852e0c0dfa46a747a297b2b8bab9a (patch)
tree6082809e3a41f58f36dbf5a7bfea105e22fcd97d
parent5af33f2eb25475eabe3c8136920104e3bf25907e (diff)
parent542deafade9559ea3d0b0bfa002985349bf62e09 (diff)
Merge pull request #28948 from vespa-engine/baledr/use-default-compiler-options-for-pr-build
Just use default cpu architechture for PR builds
-rwxr-xr-xscrewdriver/build-vespa.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh
index 1f43770b871..72b26e1032e 100755
--- a/screwdriver/build-vespa.sh
+++ b/screwdriver/build-vespa.sh
@@ -24,8 +24,7 @@ fi
build_cpp() {
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" $1
+ cmake3 -DVESPA_UNPRIVILEGED=no $1
time make -j ${NUM_THREADS}
time ctest3 --output-on-failure -j ${NUM_THREADS}
ccache --show-stats