Commit a0f4606f32

Andrew Kelley <andrew@ziglang.org>
2020-10-26 18:50:43
ci: still build zig even though we are using (older) zig cc
master
1 parent c6747e1
Changed files (2)
ci
azure
macos_script
CMakeLists.txt
ci/azure/macos_script
@@ -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
CMakeLists.txt
@@ -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