diff options
| author | ndbecker2 <ndbecker2@gmail.com> | 2013-09-09 16:03:44 (GMT) |
|---|---|---|
| committer | ndbecker2 <ndbecker2@gmail.com> | 2013-09-09 16:03:44 (GMT) |
| commit | 7dd07e75f428379c90eb9bb486b79ad103283bf6 (patch) | |
| tree | e092687e3627414986c2b7731eed46e3ac34a61c /src/engine/SCons/Scanner/__init__.py | |
| parent | 8473d8293b056663f8a3caf04550039b18690a70 (diff) | |
| download | SCons-7dd07e75f428379c90eb9bb486b79ad103283bf6.zip SCons-7dd07e75f428379c90eb9bb486b79ad103283bf6.tar.gz SCons-7dd07e75f428379c90eb9bb486b79ad103283bf6.tar.bz2 | |
fix for cpp scanner (maybe)
(transplanted from c68b1a5da5ad47befc3a7e802d8ae23372f0e1a8)
Diffstat (limited to 'src/engine/SCons/Scanner/__init__.py')
| -rw-r--r-- | src/engine/SCons/Scanner/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py index 8801094..b947961 100644 --- a/src/engine/SCons/Scanner/__init__.py +++ b/src/engine/SCons/Scanner/__init__.py @@ -394,6 +394,7 @@ class ClassicCPP(Classic): the contained filename in group 1. """ def find_include(self, include, source_dir, path): + include = list (map (SCons.Util.to_str, include)) if include[0] == '"': paths = (source_dir,) + tuple(path) else: @@ -405,7 +406,7 @@ class ClassicCPP(Classic): return n, i def sort_key(self, include): - return SCons.Node.FS._my_normcase(' '.join(include)) + return SCons.Node.FS._my_normcase(b' '.join(include)) # Local Variables: # tab-width:4 |