Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use /root/.ccache for CCACHE_DIR for not bypassing ccache when we modify /root in actions.py. A more elegant way is to read CCACHE_DIR from pisi.conf

Browse Source
This commit is contained in:
Ozan Çağlayan
2010-05-24 09:55:55 +00:00
parent da377aac73
commit 32030e2301
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations/build.py
+4 -1
View File
@@ -311,6 +311,9 @@ class Builder:
if os.path.exists("/usr/lib/ccache/bin/gcc"): if os.path.exists("/usr/lib/ccache/bin/gcc"):
# Add ccache directory for support Compiler Cache :) # Add ccache directory for support Compiler Cache :)
os.environ["PATH"] = "/usr/lib/ccache/bin/:%s" % os.environ["PATH"] os.environ["PATH"] = "/usr/lib/ccache/bin/:%s" % os.environ["PATH"]
# Force ccache to use /root/.ccache instead of $HOME/.ccache which can be modified
# through actions.py
os.environ["CCACHE_DIR"] = "/root/.ccache"
ctx.ui.info(_("CCache detected...")) ctx.ui.info(_("CCache detected..."))
def fetch_files(self): def fetch_files(self):
@@ -566,7 +569,7 @@ class Builder:
# Extra path for ccache when needed # Extra path for ccache when needed
if ctx.config.values.build.buildhelper == "ccache": if ctx.config.values.build.buildhelper == "ccache":
valid_paths.append("%s/.ccache" % os.environ["HOME"]) valid_paths.append(os.environ.get("CCACHE_DIR", "/root/.ccache"))
ret = catbox.run(self.actionLocals[func], valid_paths, logger=self.log_sandbox_violation) ret = catbox.run(self.actionLocals[func], valid_paths, logger=self.log_sandbox_violation)
# Retcode can be 0 while there is a sanbox violation, so only look for violations to correctly handle it # Retcode can be 0 while there is a sanbox violation, so only look for violations to correctly handle it