diff options
| author | Michaël Zasso <targos@protonmail.com> | 2019-09-03 09:46:55 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2019-09-05 13:53:24 +0200 |
| commit | af161f0efb1eb6690c64144cff2988d25186a46f (patch) | |
| tree | db97714abdae29b944bfa4dbe3c02bfa8cb6729d /tools | |
| parent | 17d87d522c674362a4769d20c05cb0f1daf10e7f (diff) | |
| download | android-node-v8-af161f0efb1eb6690c64144cff2988d25186a46f.tar.gz android-node-v8-af161f0efb1eb6690c64144cff2988d25186a46f.tar.bz2 android-node-v8-af161f0efb1eb6690c64144cff2988d25186a46f.zip | |
tools: fix GYP ninja generator for Python 3
PR-URL: https://github.com/nodejs/node/pull/29416
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/ninja.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/gyp/pylib/gyp/generator/ninja.py b/tools/gyp/pylib/gyp/generator/ninja.py index e66979ddbb..75743e770d 100644 --- a/tools/gyp/pylib/gyp/generator/ninja.py +++ b/tools/gyp/pylib/gyp/generator/ninja.py @@ -355,7 +355,7 @@ class NinjaWriter(object): Uses a stamp file if necessary.""" - assert targets == filter(None, targets), targets + assert targets == [item for item in targets if item], targets if len(targets) == 0: assert not order_only return None @@ -432,8 +432,8 @@ class NinjaWriter(object): compile_depends.append(target.PreCompileInput()) if target.uses_cpp: self.target.uses_cpp = True - actions_depends = filter(None, actions_depends) - compile_depends = filter(None, compile_depends) + actions_depends = [item for item in actions_depends if item] + compile_depends = [item for item in compile_depends if item] actions_depends = self.WriteCollapsedDependencies('actions_depends', actions_depends) compile_depends = self.WriteCollapsedDependencies('compile_depends', @@ -2381,6 +2381,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params, qualified_target_for_hash = gyp.common.QualifiedTarget(build_file, name, toolset) + qualified_target_for_hash = qualified_target_for_hash.encode('utf-8') hash_for_rules = hashlib.md5(qualified_target_for_hash).hexdigest() base_path = os.path.dirname(build_file) |