Fix for relative CPPPATH when BuildDir() is in use. (Charles Crain)

2 files changed, 21 insertions, 0 deletions

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 6ccd146..61cd80c 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -499,6 +499,21 @@ class Dir(Entry):
             self._sconsign = SCons.Sig.SConsignFile(self)
         return self._sconsign
 
+    def __str__(self):
+        # Reimplemented from Entry since, unlike for
+        # Entry and File, we want to return the source
+        # path *even if* the builder is non-zero
+        # (which it always is for a directory)
+        if self.duplicate:
+            return self.path
+        else:
+            return self.srcpath
+
+    def exists(self):
+        # Again, directories are special...we don't care if their
+        # source path exists, we only care about the path.
+        return os.path.exists(self.path)
+
 
 
 # XXX TODO?
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index ef0c72b..ee82563 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -108,6 +108,12 @@ class BuildDirTestCase(unittest.TestCase):
         assert f2.srcpath == os.path.normpath('src/test1'), str(f2)
         assert str(f2) == os.path.normpath('build/var2/test1'), str(f2)
 
+        d1 = fs.Dir('build/var1')
+        d2 = fs.Dir('build/var2')
+
+        assert str(d1) == 'src', str(d1)
+        assert str(d2) == os.path.normpath('build/var2'), str(d2)
+
         # Test to see if file_link() works...
         test=TestCmd(workdir='')
         test.subdir('src','build')