diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2014-11-22 02:23:07 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2014-11-22 02:23:07 (GMT) |
| commit | a70356433e90bd47effd63be867ab53cd99e057d (patch) | |
| tree | 950e76ebd845972bbdf6c1d64dfc0ff6b835b805 | |
| parent | 60e8da125b20548a224239451314a1b20c9bccf7 (diff) | |
| parent | 9870d3bc73b37dd7fb3cfaa34d8c876f6c4a6734 (diff) | |
| download | Ninja-a70356433e90bd47effd63be867ab53cd99e057d.zip Ninja-a70356433e90bd47effd63be867ab53cd99e057d.tar.gz Ninja-a70356433e90bd47effd63be867ab53cd99e057d.tar.bz2 | |
Merge pull request #863 from nico/nopthread
Stop linking pthread.
| -rwxr-xr-x | configure.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.py b/configure.py index 6d4c4d4..b38ac86 100755 --- a/configure.py +++ b/configure.py @@ -490,7 +490,6 @@ if options.bootstrap: n.comment('Tests all build into ninja_test executable.') -test_libs = libs objs = [] for name in ['build_log_test', @@ -513,10 +512,8 @@ if platform.is_windows(): for name in ['includes_normalize_test', 'msvc_helper_test']: objs += cxx(name) -if not platform.is_windows(): - test_libs.append('-lpthread') ninja_test = n.build(binary('ninja_test'), 'link', objs, implicit=ninja_lib, - variables=[('libs', test_libs)]) + variables=[('libs', libs)]) n.newline() all_targets += ninja_test |