From 553fbeba825653da8be8040be1c0b4d4fe025066 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 14 Apr 2021 23:49:16 -0700 Subject: [PATCH] ci: better target triple and mcpu cmake args --- ci/azure/macos_script | 2 +- ci/azure/windows_script | 2 ++ ci/srht/freebsd_script | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/azure/macos_script b/ci/azure/macos_script index d47575acc0..a9a10c8e48 100755 --- a/ci/azure/macos_script +++ b/ci/azure/macos_script @@ -38,7 +38,7 @@ cmake .. \ -DCMAKE_PREFIX_PATH="$PREFIX" \ -DCMAKE_BUILD_TYPE=Release \ -DZIG_TARGET_TRIPLE="$ARCH-native-gnu" \ - -DZIG_TARGET_MCPU="baseline" \ + -DZIG_TARGET_MCPU="x86_64_v2" \ -DZIG_STATIC=ON # Now cmake will use zig as the C/C++ compiler. We reset the environment variables diff --git a/ci/azure/windows_script b/ci/azure/windows_script index b28760d78c..fad376e43c 100644 --- a/ci/azure/windows_script +++ b/ci/azure/windows_script @@ -35,6 +35,8 @@ cmake .. -DCMAKE_BUILD_TYPE=Release \ "-DCMAKE_INSTALL_PREFIX=$(pwd)/dist" \ -DZIG_OMIT_STAGE2=ON \ -DZIG_STATIC=ON \ + -DZIG_TARGET_TRIPLE="x86_64-native-gnu" \ + -DZIG_TARGET_MCPU="x86_64_v2" \ -GNinja # Now cmake will use zig as the C/C++ compiler. We reset the environment variables diff --git a/ci/srht/freebsd_script b/ci/srht/freebsd_script index 88c2dd77a8..66b62bad38 100755 --- a/ci/srht/freebsd_script +++ b/ci/srht/freebsd_script @@ -34,7 +34,8 @@ cmake .. \ -DCMAKE_PREFIX_PATH=$PREFIX \ "-DCMAKE_INSTALL_PREFIX=$(pwd)/release" \ -DZIG_STATIC=ON \ - -DZIG_TARGET_TRIPLE="x86_64-freebsd-gnu" \ + -DZIG_TARGET_TRIPLE="x86_64-native-gnu" \ + -DZIG_TARGET_MCPU="x86_64_v2" \ -GNinja samu install