From f9ec8f0b85f0a51a4f9ab65d000ecdc387f3fde6 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 5 Aug 2025 18:53:15 +0500 Subject: [PATCH] wscript: disable {gcc,msvc}deps with wafcache enabled --- wscript | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index 8b4be6f5..da609f47 100644 --- a/wscript +++ b/wscript @@ -208,10 +208,15 @@ def configure(conf): conf.env.MSVC_TARGETS = ['x86'] # Load compilers early - conf.load('xshlib xcompile compiler_c compiler_cxx gccdeps') + conf.load('xshlib xcompile compiler_c compiler_cxx') - if conf.options.MSVCDEPS: - conf.load('msvcdeps') + if not conf.options.WAFCACHE: + conf.load('gccdeps') + + if conf.options.MSVCDEPS: + conf.load('msvcdeps') + + conf.env.WAFCACHE = conf.options.WAFCACHE if conf.options.NSWITCH: conf.load('nswitch') @@ -535,7 +540,7 @@ int main(void) { return (int)BZ2_bzlibVersion(); }''' conf.add_subproject(i.name) def build(bld): - if bld.options.WAFCACHE: + if bld.env.WAFCACHE: bld.load('wafcache') # guard rails to not let install to root