Fix substitution in command-line actions created by the global Alias() function.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index b2ae4de..c7dc474 100644
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -2285,6 +2285,12 @@ def NoSubstitutionProxy(subject):
             return getattr(self.__dict__['__subject'], name)
         def __setattr__(self, name, value):
             return setattr(self.__dict__['__subject'], name, value)
+        def executor_to_lvars(self, kwdict):
+            if kwdict.has_key('executor'):
+                kwdict['lvars'] = kwdict['executor'].get_lvars()
+                del kwdict['executor']
+            else:
+                kwdict['lvars'] = {}
         def raw_to_mode(self, dict):
             try:
                 raw = dict['raw']
@@ -2301,12 +2307,14 @@ def NoSubstitutionProxy(subject):
             nargs = (string, self,) + args
             nkw = kwargs.copy()
             nkw['gvars'] = {}
+            self.executor_to_lvars(nkw)
             self.raw_to_mode(nkw)
             return SCons.Subst.scons_subst_list(*nargs, **nkw)
         def subst_target_source(self, string, *args, **kwargs):
             nargs = (string, self,) + args
             nkw = kwargs.copy()
             nkw['gvars'] = {}
+            self.executor_to_lvars(nkw)
             self.raw_to_mode(nkw)
             return SCons.Subst.scons_subst(*nargs, **nkw)
     return _NoSubstitutionProxy(subject)