diff options
| author | William Blevins <wblevins@gmail.com> | 2015-08-07 04:25:40 (GMT) |
|---|---|---|
| committer | William Blevins <wblevins@gmail.com> | 2015-08-07 04:25:40 (GMT) |
| commit | 27ae977d3fa04e29166e172fa64f7b5439d9f0c8 (patch) | |
| tree | a92560f91eea63424753197dc329da75b5387548 /src/engine | |
| parent | 829492d37c7b85e22c169e1171265abdf4841af6 (diff) | |
| download | SCons-27ae977d3fa04e29166e172fa64f7b5439d9f0c8.zip SCons-27ae977d3fa04e29166e172fa64f7b5439d9f0c8.tar.gz SCons-27ae977d3fa04e29166e172fa64f7b5439d9f0c8.tar.bz2 | |
Issue 2264: Removed redundant SCANNER_HINT for preference of SCANNERS.
Also possibly SCons.Tool.SourceFileScanner (global only).
Updated test to reflect with case using SCANNERS plus root node default.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Node/__init__.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py index d709f11..5aa9600 100644 --- a/src/engine/SCons/Node/__init__.py +++ b/src/engine/SCons/Node/__init__.py @@ -962,19 +962,7 @@ class Node(object): if not scanner: # no scanner could be found for the given node's scanner key; # thus, make an attempt at using a default. - - # check for a user specified scanner hint - scanner = env.get( 'SCANNER_HINT' ) - - if scanner: - # Ensure scanner hint returned a valid Scanner object - if not isinstance( scanner, SCons.Scanner.Base ): - raise SCons.Errors.UserError( - 'SCANNER_HINT object must be instance of ' + str(SCons.Scanner.Base) - ) - else: - # no scanner hint, so do best guess (IE. return the root's scanner). - scanner = root_node_scanner + scanner = root_node_scanner return scanner |