| author |  Andrew Kelley <andrew@ziglang.org> 2020-10-26 10:50:43-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2020-10-26 10:50:43-07:00 |
| log | a0f4606f32bab6df88d0afc1bf9ff479470b68cc |
| tree | 77cd56d1b3d4376985ec02ece94873ba49181651 |
| parent | c6747e1063d6aadf51cbd8e6b2bbfdfc0d87326c |
ci: still build zig even though we are using (older) zig cc
2 files changed, 1 insertions(+), 2 deletions(-)
- CMakeLists.txt
ci- azure
CMakeLists.txt+1-1
| ... | ... | @@ -467,7 +467,7 @@ set(BUILD_ZIG1_ARGS |
| 467 | 467 | --pkg-end |
| 468 | 468 | ) |
| 469 | 469 | |
| 470 | if("${ZIG_TARGET_TRIPLE}" STREQUAL "native") | |
| 470 | if("${ZIG_EXECUTABLE}" STREQUAL "") | |
| 471 | 471 | add_custom_target(zig_build_zig1 ALL |
| 472 | 472 | COMMAND zig0 ${BUILD_ZIG1_ARGS} |
| 473 | 473 | DEPENDS zig0 |
ci/azure/macos_script-1
| ... | ... | @@ -37,7 +37,6 @@ cmake .. \ |
| 37 | 37 | -DCMAKE_BUILD_TYPE=Release \ |
| 38 | 38 | -DZIG_TARGET_TRIPLE="$ARCH-native-gnu" \ |
| 39 | 39 | -DZIG_TARGET_MCPU="baseline" \ |
| 40 | -DZIG_EXECUTABLE="$ZIG" \ | |
| 41 | 40 | -DZIG_STATIC=ON |
| 42 | 41 | |
| 43 | 42 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables |