zig

commit a0f4606f32bab6df88d0afc1bf9ff479470b68cc (tree)
parent c6747e1063d6aadf51cbd8e6b2bbfdfc0d87326c
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Mon, 26 Oct 2020 10:50:43 -0700

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

Diffstat:
M
CMakeLists.txt
 | 
2
+-
M
ci/azure/macos_script
 | 
1
-

2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/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
diff --git a/ci/azure/macos_script b/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