diff options
| author | Jan Niklas Hasse <jhasse@bixense.com> | 2020-11-28 11:22:23 (GMT) |
|---|---|---|
| committer | Jan Niklas Hasse <jhasse@bixense.com> | 2020-11-28 11:22:23 (GMT) |
| commit | 9cf70a20685ac3bd48fceac2ea268d449c7e78d5 (patch) | |
| tree | 433402b91ee03f5a476da5c0bdb26f6d3bad7809 /configure.py | |
| parent | a1f879b29c9aafe6a2bc0ba885701f8f4f19f772 (diff) | |
| parent | ed056bdd8c8d578a9952bd93b76f29c14199c85b (diff) | |
| download | Ninja-9cf70a20685ac3bd48fceac2ea268d449c7e78d5.zip Ninja-9cf70a20685ac3bd48fceac2ea268d449c7e78d5.tar.gz Ninja-9cf70a20685ac3bd48fceac2ea268d449c7e78d5.tar.bz2 | |
Merge branch 'master' into release
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.py b/configure.py index 8eef7e6..cded265 100755 --- a/configure.py +++ b/configure.py @@ -269,7 +269,7 @@ if configure_env: n.variable('configure_env', config_str + '$ ') n.newline() -CXX = configure_env.get('CXX', 'g++') +CXX = configure_env.get('CXX', 'c++') objext = '.o' if platform.is_msvc(): CXX = 'cl' @@ -596,6 +596,11 @@ all_targets += ninja_test n.comment('Ancillary executables.') +if platform.is_aix() and '-maix64' not in ldflags: + # Both hash_collision_bench and manifest_parser_perftest require more + # memory than will fit in the standard 32-bit AIX shared stack/heap (256M) + libs.append('-Wl,-bmaxdata:0x80000000') + for name in ['build_log_perftest', 'canon_perftest', 'depfile_parser_perftest', |