From: Daniel Robbins <drobbins@gentoo.org>
Date: Tue, 3 Feb 2004 05:51:31 +0000 (+0000)
Subject: ccache should work now
X-Git-Tag: CATALYST_1_0_1~38
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6303f3b1499b6234c4e8a89fa70cbf2fc7cb2a5b;p=catalyst.git

ccache should work now


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@202 d1e1f19c-881f-0410-ab34-b69fee027534
---

diff --git a/catalyst b/catalyst
index 4a5a724f..de65cabf 100755
--- a/catalyst
+++ b/catalyst
@@ -60,13 +60,8 @@ targetmap={}
 targets.register(targetmap)
 
 if "ccache" in string.split(myspec["options"]):
-	if not os.environ.has_key("CCACHE_DIR"):
-		print "Compiler cache support disabled (no CCACHE_DIR defined)"
-	elif not os.path.exists(os.environ["CCACHE_DIR"]):
-		print "Compiler cache support disabled (no cache found at CCACHE_DIR)"
-	else:
-		myspec["CCACHE"]="1"
-		print "Compiler cache support enabled."
+	myspec["CCACHE"]="1"
+	print "Compiler cache support enabled."
 if "pkgcache" in string.split(myspec["options"]):
 	print "Package cache support enabled."
 	myspec["PKGCACHE"]="1"
diff --git a/modules/targets.py b/modules/targets.py
index 38b5771c..959ff174 100644
--- a/modules/targets.py
+++ b/modules/targets.py
@@ -102,8 +102,15 @@ class generic_stage_target(generic_target):
 			self.mountmap["/usr/portage/packages"]=self.settings["pkgcache_path"]
 
 		if self.settings.has_key("CCACHE"):
-			self.mounts.append(os.environ["CCACHE_DIR"])
-			self.mountmap["/var/tmp/portage/.ccache"]=os.environ["CCACHE_DIR"]
+			if os.environ.has_key("CCACHE_DIR"):
+				ccdir=os.environ["CCACHE_DIR"]
+				del os.environ["CCACHE_DIR"]
+			else:
+				ccdir="/var/tmp/portage/ccache"
+			if not os.path.isdir(ccdir):
+					raise CatalystError,"Compiler cache support can't be enabled (can't find "+ccdir+")"
+			self.mounts.append("/var/tmp/portage/ccache")
+			self.mountmap["/var/tmp/portage/ccache"]=ccdir
 		
 		if self.settings["target"]=="grp":
 			self.mounts.append("/tmp/grp")