| author |  Andrew Kelley <andrew@ziglang.org> 2021-04-14 23:49:16-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2021-04-14 23:49:16-07:00 |
| log | 553fbeba825653da8be8040be1c0b4d4fe025066 |
| tree | 13c7e81a5d583c16cdefefe81d59b491e98d0b4d |
| parent | 85755c51d529e7d9b406c6bdf69ce0a0f33f3353 |
ci: better target triple and mcpu cmake args
3 files changed, 5 insertions(+), 2 deletions(-)
ci- srht
ci/azure/macos_script+1-1
| ... | @@ -38,7 +38,7 @@ cmake .. \ | ... | @@ -38,7 +38,7 @@ cmake .. \ |
| 38 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 38 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| 39 | -DCMAKE_BUILD_TYPE=Release \ | 39 | -DCMAKE_BUILD_TYPE=Release \ |
| 40 | -DZIG_TARGET_TRIPLE="$ARCH-native-gnu" \ | 40 | -DZIG_TARGET_TRIPLE="$ARCH-native-gnu" \ |
| 41 | -DZIG_TARGET_MCPU="baseline" \ | 41 | -DZIG_TARGET_MCPU="x86_64_v2" \ |
| 42 | -DZIG_STATIC=ON | 42 | -DZIG_STATIC=ON |
| 43 | 43 | ||
| 44 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | 44 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables |
ci/azure/windows_script+2
| ... | @@ -35,6 +35,8 @@ cmake .. -DCMAKE_BUILD_TYPE=Release \ | ... | @@ -35,6 +35,8 @@ cmake .. -DCMAKE_BUILD_TYPE=Release \ |
| 35 | "-DCMAKE_INSTALL_PREFIX=$(pwd)/dist" \ | 35 | "-DCMAKE_INSTALL_PREFIX=$(pwd)/dist" \ |
| 36 | -DZIG_OMIT_STAGE2=ON \ | 36 | -DZIG_OMIT_STAGE2=ON \ |
| 37 | -DZIG_STATIC=ON \ | 37 | -DZIG_STATIC=ON \ |
| 38 | -DZIG_TARGET_TRIPLE="x86_64-native-gnu" \ | ||
| 39 | -DZIG_TARGET_MCPU="x86_64_v2" \ | ||
| 38 | -GNinja | 40 | -GNinja |
| 39 | 41 | ||
| 40 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables | 42 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables |
ci/srht/freebsd_script+2-1
| ... | @@ -34,7 +34,8 @@ cmake .. \ | ... | @@ -34,7 +34,8 @@ cmake .. \ |
| 34 | -DCMAKE_PREFIX_PATH=$PREFIX \ | 34 | -DCMAKE_PREFIX_PATH=$PREFIX \ |
| 35 | "-DCMAKE_INSTALL_PREFIX=$(pwd)/release" \ | 35 | "-DCMAKE_INSTALL_PREFIX=$(pwd)/release" \ |
| 36 | -DZIG_STATIC=ON \ | 36 | -DZIG_STATIC=ON \ |
| 37 | -DZIG_TARGET_TRIPLE="x86_64-freebsd-gnu" \ | 37 | -DZIG_TARGET_TRIPLE="x86_64-native-gnu" \ |
| 38 | -DZIG_TARGET_MCPU="x86_64_v2" \ | ||
| 38 | -GNinja | 39 | -GNinja |
| 39 | samu install | 40 | samu install |
| 40 | 41 |