diff --git a/SConscript b/SConscript index 9cd137b..238dee9 100644 --- a/SConscript +++ b/SConscript @@ -505,8 +505,6 @@ if 'TOOLS' in config: env = Environment(tools = tools, variables = vars, ENV = os.environ) env['RECIPES_FOLDERS'] = [Dir('recipes')] env['SYSTEM_CACHE_DIR'] = os.path.join(_find_system_cache_dir(), 'spp_cache') -env['CLONE_DIR'] = os.path.join(env['SYSTEM_CACHE_DIR'], 'cloned') -env['DOWNLOAD_DIR'] = os.path.join(env['SYSTEM_CACHE_DIR'], 'downloaded') env['UPDATE_REPOSITORIES'] = update_repositories env['CXX_STANDARD'] = config['CXX_STANDARD'] # make it available to everyone env['DEPS_CFLAGS'] = [] @@ -518,9 +516,11 @@ try: os.makedirs(env['SYSTEM_CACHE_DIR'], exist_ok=True) except: env['SYSTEM_CACHE_DIR'] = os.path.join(_get_fallback_cache_dir(), 'spp_cache') - env['CLONE_DIR'] = os.path.join(env['SYSTEM_CACHE_DIR'], 'cloned') print(f'Creating spp cache dir failed, using fallback: {env["SYSTEM_CACHE_DIR"]}.') os.makedirs(env['SYSTEM_CACHE_DIR'], exist_ok=True) # no more safeguards! +env['CLONE_DIR'] = os.path.join(env['SYSTEM_CACHE_DIR'], 'cloned') +env['DOWNLOAD_DIR'] = os.path.join(env['SYSTEM_CACHE_DIR'], 'downloaded') + env['SHARED_CACHE_DIR'] = Dir(f'#cache').abspath # allow compiling to variant directories (each gets their own bin/lib/cache dirs)