The toolchain_build git cache is now referenced as a git-alternate.

toolchain_build/substituter.py

Index: toolchain_build/substituter.py
diff --git a/toolchain_build/substituter.py b/toolchain_build/substituter.py
index ff3ff029d985fccc68bbdb14c6ef810232dddf2e..bacb1619e16fef8bba4f3b3ee67d089b14b59341 100644
--- a/toolchain_build/substituter.py
+++ b/toolchain_build/substituter.py
@@ -73,8 +73,15 @@ class Substituter(object):
     self._variables = self._nonpaths.copy()
     self._variables['cwd'] = FixPath(os.path.abspath(self._cwd))
     for key, value in self._paths.iteritems():
-      self._variables['abs_' + key] = FixPath(os.path.abspath(value))
-      self._variables[key] = FixPath(os.path.relpath(value, self._cwd))
+      if value:

[Derek Schuff, 2014/06/26 00:00:47]

how are empty paths getting in here? seems like we should avoid that?

+        abs_path = FixPath(os.path.abspath(value))
+        key_path = FixPath(os.path.relpath(value, self._cwd))
+      else:
+        abs_path = value
+        key_path = value
+
+      self._variables['abs_' + key] = abs_path
+      self._variables[key] = key_path
 
   def Substitute(self, template):
     """ Substitute the %-variables in 'template' """
@@ -86,7 +93,10 @@ class Substituter(object):
     All variables in the template must be paths, and if the values are relative
     paths, they are resolved relative to cwd and returned as absolute paths.
     """
-    return AbsPath(self.Substitute(template), self._cwd)
+    path = self.Substitute(template)
+    if path:
+      path = AbsPath(path, self._cwd)
+    return path
 
   def _SetUpCommonNonPaths(self):
     try: