authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-26 10:50:43-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-26 10:50:43-07:00
loga0f4606f32bab6df88d0afc1bf9ff479470b68cc
tree77cd56d1b3d4376985ec02ece94873ba49181651
parentc6747e1063d6aadf51cbd8e6b2bbfdfc0d87326c

ci: still build zig even though we are using (older) zig cc

2 files changed, 1 insertions(+), 2 deletions(-)

CMakeLists.txt+1-1
...@@ -467,7 +467,7 @@ set(BUILD_ZIG1_ARGS...@@ -467,7 +467,7 @@ set(BUILD_ZIG1_ARGS
467 --pkg-end467 --pkg-end
468)468)
469469
470if("${ZIG_TARGET_TRIPLE}" STREQUAL "native")470if("${ZIG_EXECUTABLE}" STREQUAL "")
471 add_custom_target(zig_build_zig1 ALL471 add_custom_target(zig_build_zig1 ALL
472 COMMAND zig0 ${BUILD_ZIG1_ARGS}472 COMMAND zig0 ${BUILD_ZIG1_ARGS}
473 DEPENDS zig0473 DEPENDS zig0
ci/azure/macos_script-1
...@@ -37,7 +37,6 @@ cmake .. \...@@ -37,7 +37,6 @@ cmake .. \
37 -DCMAKE_BUILD_TYPE=Release \37 -DCMAKE_BUILD_TYPE=Release \
38 -DZIG_TARGET_TRIPLE="$ARCH-native-gnu" \38 -DZIG_TARGET_TRIPLE="$ARCH-native-gnu" \
39 -DZIG_TARGET_MCPU="baseline" \39 -DZIG_TARGET_MCPU="baseline" \
40 -DZIG_EXECUTABLE="$ZIG" \
41 -DZIG_STATIC=ON40 -DZIG_STATIC=ON
4241
43# Now cmake will use zig as the C/C++ compiler. We reset the environment variables42# Now cmake will use zig as the C/C++ compiler. We reset the environment variables