diff options
| author | Evan Martin <martine@danga.com> | 2012-04-30 16:22:19 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-04-30 16:22:19 (GMT) |
| commit | a40480745a06bfb96ab4f3758dad218857c5172d (patch) | |
| tree | 071b3be46795a7405fd56ac5912dc92ea7af7344 /configure.py | |
| parent | 69f465ed845e9a4e652435a31f09f2ca537f6f54 (diff) | |
| parent | 6a8005155034a5cb580dc18700f3ead49dbf4532 (diff) | |
| download | Ninja-a40480745a06bfb96ab4f3758dad218857c5172d.zip Ninja-a40480745a06bfb96ab4f3758dad218857c5172d.tar.gz Ninja-a40480745a06bfb96ab4f3758dad218857c5172d.tar.bz2 | |
Merge pull request #285 from nico/winninjatest
Make it possible to write `ninja ninja_test` on windows (as opposed to `ninja ninja_test.exe`). Also `ninja ninja`.
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.py b/configure.py index dc727e8..b7d7908 100755 --- a/configure.py +++ b/configure.py @@ -246,6 +246,8 @@ 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': + n.build('ninja', 'phony', ninja) n.newline() all_targets += ninja @@ -298,9 +300,12 @@ 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': + n.build('ninja_test', 'phony', ninja_test) n.newline() all_targets += ninja_test + n.comment('Perftest executable.') objs = cxx('parser_perftest') parser_perftest = n.build(binary('parser_perftest'), 'link', objs, |