projects
/
scons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Branch for User's Guide changes.
[scons.git]
/
src
/
engine
/
SCons
/
Environment.py
diff --git
a/src/engine/SCons/Environment.py
b/src/engine/SCons/Environment.py
index d0a22b5672129ba983a6273b77e44cc960fcea54..fae86e44c8e0ce4db12d06ac6ecb0c5ea45256b6 100644
(file)
--- a/
src/engine/SCons/Environment.py
+++ b/
src/engine/SCons/Environment.py
@@
-165,7
+165,7
@@
class Environment:
"""
def __init__(self,
"""
def __init__(self,
- platform=
SCons.Platform.Platform()
,
+ platform=
None
,
tools=None,
options=None,
**kw):
tools=None,
options=None,
**kw):
@@
-174,6
+174,10
@@
class Environment:
self._dict['BUILDERS'] = BuilderDict(self._dict['BUILDERS'], self)
self._dict['BUILDERS'] = BuilderDict(self._dict['BUILDERS'], self)
+ if platform is None:
+ platform = self._dict.get('PLATFORM', None)
+ if platform is None:
+ platform = SCons.Platform.Platform()
if SCons.Util.is_String(platform):
platform = SCons.Platform.Platform(platform)
self._dict['PLATFORM'] = str(platform)
if SCons.Util.is_String(platform):
platform = SCons.Platform.Platform(platform)
self._dict['PLATFORM'] = str(platform)
@@
-189,7
+193,9
@@
class Environment:
options.Update(self)
if tools is None:
options.Update(self)
if tools is None:
- tools = ['default']
+ tools = self._dict.get('TOOLS', None)
+ if tools is None:
+ tools = ['default']
apply_tools(self, tools)
# Reapply the passed in variables after calling the tools,
apply_tools(self, tools)
# Reapply the passed in variables after calling the tools,