summaryrefslogtreecommitdiffstats
path: root/methods.py
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-11-28 09:17:05 +0100
committerGitHub <noreply@github.com>2017-11-28 09:17:05 +0100
commit95e7656a152f6158b50ff15f232097ff2175d170 (patch)
tree72f06c4b4a0aaa17aa9108bc12f20d057b671151 /methods.py
parenta26b36bec2e99a128b7a61ff9fa1e2e46148f547 (diff)
parenta4a222d62dcffaf93e3dd439c3f61836a4cd831e (diff)
downloadredot-engine-95e7656a152f6158b50ff15f232097ff2175d170.tar.gz
Merge pull request #13359 from rraallvv/cache_pruning
Fixes for SCons shared cache for Travis-CI and AppVeyor-CI (master)
Diffstat (limited to 'methods.py')
-rw-r--r--methods.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/methods.py b/methods.py
index 2be73f02d2..0bf5c01462 100644
--- a/methods.py
+++ b/methods.py
@@ -1496,6 +1496,7 @@ def split_lib(self, libname):
if base != cur_base and len(list) > max_src:
if num > 0:
lib = env.Library(libname + str(num), list)
+ env.NoCache(lib)
lib_list.append(lib)
list = []
num = num + 1
@@ -1503,6 +1504,7 @@ def split_lib(self, libname):
list.append(f)
lib = env.Library(libname + str(num), list)
+ env.NoCache(lib)
lib_list.append(lib)
if len(lib_list) > 0:
@@ -1510,11 +1512,14 @@ def split_lib(self, libname):
if os.name == 'posix' and sys.platform == 'msys':
env.Replace(ARFLAGS=['rcsT'])
lib = env.Library(libname + "_collated", lib_list)
+ env.NoCache(lib)
lib_list = [lib]
lib_base = []
env.add_source_files(lib_base, "*.cpp")
- lib_list.insert(0, env.Library(libname, lib_base))
+ lib = env.Library(libname, lib_base)
+ env.NoCache(lib)
+ lib_list.insert(0, lib)
env.Prepend(LIBS=lib_list)