diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2012-05-01 03:15:30 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2012-05-01 03:15:30 (GMT) |
| commit | 53c55b0a32a915d83fdec246ef58fe2ab57f2e47 (patch) | |
| tree | 6a254eb31e77fd3527dcbb4f99c360e23e97882e /configure.py | |
| parent | a40480745a06bfb96ab4f3758dad218857c5172d (diff) | |
| download | Ninja-53c55b0a32a915d83fdec246ef58fe2ab57f2e47.zip Ninja-53c55b0a32a915d83fdec246ef58fe2ab57f2e47.tar.gz Ninja-53c55b0a32a915d83fdec246ef58fe2ab57f2e47.tar.bz2 | |
ninja_syntax.build() returns a list, not a single string.
Fixes 'multiple rules' warnings on mac/linux.
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.py b/configure.py index b7d7908..bd3da67 100755 --- a/configure.py +++ b/configure.py @@ -246,7 +246,7 @@ n.comment('Main executable is library plus main() function.') 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 @@ -300,7 +300,7 @@ if platform != 'mingw' and platform != 'windows': 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 |