Skip to content

Commit

Permalink
ninja_syntax.build() returns a list, not a single string.
Browse files Browse the repository at this point in the history
Fixes 'multiple rules' warnings on mac/linux.
  • Loading branch information
nico committed May 1, 2012
1 parent a404807 commit 53c55b0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def binary(name):
objs = cxx('ninja')
ninja = n.build(binary('ninja'), 'link', objs, implicit=ninja_lib,
variables=[('libs', libs)])
if ninja != 'ninja':
if 'ninja' not in ninja:
n.build('ninja', 'phony', ninja)
n.newline()
all_targets += ninja
Expand Down Expand Up @@ -300,7 +300,7 @@ def binary(name):
ninja_test = n.build(binary('ninja_test'), 'link', objs, implicit=ninja_lib,
variables=[('ldflags', test_ldflags),
('libs', test_libs)])
if ninja_test != 'ninja_test':
if 'ninja_test' not in ninja_test:
n.build('ninja_test', 'phony', ninja_test)
n.newline()
all_targets += ninja_test
Expand Down

0 comments on commit 53c55b0

Please sign in to comment.