From 1f0f6662101b60d2ca5890af97cfae84f65b20de Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Wed, 25 Sep 2024 13:02:56 -0700 Subject: [PATCH] Fix zig build again (#14165) --- cmake/Globals.cmake | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmake/Globals.cmake b/cmake/Globals.cmake index 3b9714548bd15..303e49802a1a4 100644 --- a/cmake/Globals.cmake +++ b/cmake/Globals.cmake @@ -129,13 +129,14 @@ else() set(WARNING WARNING) endif() -if(CI) - set(DEFAULT_VENDOR_PATH ${CACHE_PATH}/vendor) -else() - set(DEFAULT_VENDOR_PATH ${CWD}/vendor) -endif() - -optionx(VENDOR_PATH FILEPATH "The path to the vendor directory" DEFAULT ${DEFAULT_VENDOR_PATH}) +# TODO: This causes flaky zig builds in CI, so temporarily disable it. +# if(CI) +# set(DEFAULT_VENDOR_PATH ${CACHE_PATH}/vendor) +# else() +# set(DEFAULT_VENDOR_PATH ${CWD}/vendor) +# endif() + +optionx(VENDOR_PATH FILEPATH "The path to the vendor directory" DEFAULT ${CWD}/vendor) optionx(TMP_PATH FILEPATH "The path to the temporary directory" DEFAULT ${BUILD_PATH}/tmp) optionx(FRESH BOOL "Set when --fresh is used" DEFAULT OFF)