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

master
Andrew Kelley 2020-10-26 10:50:43 -07:00
parent c6747e1063
commit a0f4606f32
2 changed files with 1 additions and 2 deletions

View File

@ -467,7 +467,7 @@ set(BUILD_ZIG1_ARGS
--pkg-end
)
if("${ZIG_TARGET_TRIPLE}" STREQUAL "native")
if("${ZIG_EXECUTABLE}" STREQUAL "")
add_custom_target(zig_build_zig1 ALL
COMMAND zig0 ${BUILD_ZIG1_ARGS}
DEPENDS zig0

View File

@ -37,7 +37,6 @@ cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DZIG_TARGET_TRIPLE="$ARCH-native-gnu" \
-DZIG_TARGET_MCPU="baseline" \
-DZIG_EXECUTABLE="$ZIG" \
-DZIG_STATIC=ON
# Now cmake will use zig as the C/C++ compiler. We reset the environment variables