Skip to content

Commit 2f81d59

Browse files
committed
tools: fix GYP ninja generator for Python 3
PR-URL: #29416 Reviewed-By: Christian Clauss <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
1 parent 010d29d commit 2f81d59

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tools/gyp/pylib/gyp/generator/ninja.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def WriteCollapsedDependencies(self, name, targets, order_only=None):
355355
356356
Uses a stamp file if necessary."""
357357

358-
assert targets == filter(None, targets), targets
358+
assert targets == [item for item in targets if item], targets
359359
if len(targets) == 0:
360360
assert not order_only
361361
return None
@@ -432,8 +432,8 @@ def WriteSpec(self, spec, config_name, generator_flags):
432432
compile_depends.append(target.PreCompileInput())
433433
if target.uses_cpp:
434434
self.target.uses_cpp = True
435-
actions_depends = filter(None, actions_depends)
436-
compile_depends = filter(None, compile_depends)
435+
actions_depends = [item for item in actions_depends if item]
436+
compile_depends = [item for item in compile_depends if item]
437437
actions_depends = self.WriteCollapsedDependencies('actions_depends',
438438
actions_depends)
439439
compile_depends = self.WriteCollapsedDependencies('compile_depends',
@@ -2381,6 +2381,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
23812381

23822382
qualified_target_for_hash = gyp.common.QualifiedTarget(build_file, name,
23832383
toolset)
2384+
qualified_target_for_hash = qualified_target_for_hash.encode('utf-8')
23842385
hash_for_rules = hashlib.md5(qualified_target_for_hash).hexdigest()
23852386

23862387
base_path = os.path.dirname(build_file)

0 commit comments

Comments
 (0)