diff options
| author | Evan Martin <martine@danga.com> | 2011-05-13 23:24:27 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2011-05-13 23:28:41 (GMT) |
| commit | e00f0b1586e2c7f49f5d1d8ff96f1e6ab3ff4051 (patch) | |
| tree | 2088bde8a041e727ddd7e93d855d9e4224f4bcff /configure.py | |
| parent | 54ae1a37ea6396628b75bdc0021f1ef4848deb84 (diff) | |
| download | Ninja-e00f0b1586e2c7f49f5d1d8ff96f1e6ab3ff4051.zip Ninja-e00f0b1586e2c7f49f5d1d8ff96f1e6ab3ff4051.tar.gz Ninja-e00f0b1586e2c7f49f5d1d8ff96f1e6ab3ff4051.tar.bz2 | |
remove order-only hacks now that semantics changed
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.py b/configure.py index 1dc777e..9353c76 100755 --- a/configure.py +++ b/configure.py @@ -132,7 +132,7 @@ n.newline() n.comment('Main executable is library plus main() function.') objs = cxx('ninja') -n.build('ninja', 'link', objs, implicit=ninja_lib, order_only=ninja_lib, +n.build('ninja', 'link', objs, implicit=ninja_lib, variables=[('libs', '-L$builddir -lninja')]) n.comment('Tests all build into ninja_test executable.') @@ -144,7 +144,7 @@ for name in ['build_test', 'build_log_test', 'graph_test', 'ninja_test', ldflags.append('-lgtest_main -lgtest') if platform != 'mingw': ldflags.append('-lpthread') -n.build('ninja_test', 'link', objs, implicit=ninja_lib, order_only=ninja_lib, +n.build('ninja_test', 'link', objs, implicit=ninja_lib, variables=[('libs', '-L$builddir -lninja'), ('ldflags', ' '.join(ldflags))]) n.newline() @@ -180,8 +180,7 @@ mainpage = n.build(built('doxygen_mainpage'), 'doxygen_mainpage', ['README', 'HACKING', 'COPYING'], implicit=['$doxygen_mainpage_generator']) n.build('doxygen', 'doxygen', 'doxygen.config', - implicit=mainpage, - order_only=mainpage) + implicit=mainpage) n.newline() n.comment('Regenerate build files if build script changes.') |