From 1edcd18c0dfb8d4648342831a36582f52a174e39 Mon Sep 17 00:00:00 2001
From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Tue, 26 Apr 2005 03:15:33 +0000
Subject: [PATCH] Win32 portability for recent RootDir and rel_path() changes.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1283 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---
 src/engine/SCons/Node/FS.py       | 3 +++
 src/engine/SCons/Node/__init__.py | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 52919b0f..75efc15b 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -1399,6 +1399,9 @@ class RootDir(Dir):
         self.path = name + os.sep
         self._morph()
 
+    def __str__(self):
+        return self.abspath
+
     def entry_abspath(self, name):
         return self.abspath + name
 
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 8754c7de..28f1c194 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -608,7 +608,10 @@ class Node:
         return binfo
 
     def rel_path(self, other):
-        return str(other)
+        # Using other.__str__() instead of str(other) lets the Memoizer
+        # get the right method for the underlying Node object, not the
+        # __str__() method for the Memoizer wrapper object.
+        return other.__str__()
 
     def del_cinfo(self):
         try:
-- 
2.26.2