diff options
Diffstat (limited to 'ninja/configure.py')
| -rwxr-xr-x | ninja/configure.py | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/ninja/configure.py b/ninja/configure.py index 78cd1deb0dc..a4437489426 100755 --- a/ninja/configure.py +++ b/ninja/configure.py @@ -98,7 +98,7 @@ class Platform(object): return self._platform == 'aix' def uses_usr_local(self): - return self._platform in ('freebsd', 'openbsd', 'bitrig', 'dragonfly', 'netbsd') + return self._platform in ('freebsd', 'openbsd', 'bitrig', 'dragonfly') def supports_ppoll(self): return self._platform in ('freebsd', 'linux', 'openbsd', 'bitrig', @@ -256,7 +256,7 @@ configure_args = sys.argv[1:] if '--bootstrap' in configure_args: configure_args.remove('--bootstrap') n.variable('configure_args', ' '.join(configure_args)) -env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']) +env_keys = set(['CXX', 'AR', 'CFLAGS', 'LDFLAGS']) configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) if configure_env: config_str = ' '.join([k + '=' + pipes.quote(configure_env[k]) @@ -356,11 +356,6 @@ else: if platform.uses_usr_local(): cflags.append('-I/usr/local/include') ldflags.append('-L/usr/local/lib') - if platform.is_aix(): - # printf formats for int64_t, uint64_t; large file support - cflags.append('-D__STDC_FORMAT_MACROS') - cflags.append('-D_LARGE_FILES') - libs = [] @@ -402,10 +397,6 @@ def shell_escape(str): if 'CFLAGS' in configure_env: cflags.append(configure_env['CFLAGS']) - ldflags.append(configure_env['CFLAGS']) -if 'CXXFLAGS' in configure_env: - cflags.append(configure_env['CXXFLAGS']) - ldflags.append(configure_env['CXXFLAGS']) n.variable('cflags', ' '.join(shell_escape(flag) for flag in cflags)) if 'LDFLAGS' in configure_env: ldflags.append(configure_env['LDFLAGS']) @@ -414,7 +405,7 @@ n.newline() if platform.is_msvc(): n.rule('cxx', - command='$cxx $cflags -c $in /Fo$out /Fd' + built('$pdb'), + command='$cxx $cflags -c $in /Fo$out', description='CXX $out', deps='msvc' # /showIncludes is included in $cflags. ) @@ -485,9 +476,6 @@ else: n.newline() n.comment('Core source files all build into ninja library.') -cxxvariables = [] -if platform.is_msvc(): - cxxvariables = [('pdb', 'ninja.pdb')] for name in ['build', 'build_log', 'clean', @@ -508,15 +496,15 @@ for name in ['build', 'string_piece_util', 'util', 'version']: - objs += cxx(name, variables=cxxvariables) + objs += cxx(name) if platform.is_windows(): for name in ['subprocess-win32', 'includes_normalize-win32', 'msvc_helper-win32', 'msvc_helper_main-win32']: - objs += cxx(name, variables=cxxvariables) + objs += cxx(name) if platform.is_msvc(): - objs += cxx('minidump-win32', variables=cxxvariables) + objs += cxx('minidump-win32') objs += cc('getopt') else: objs += cxx('subprocess-posix') @@ -539,7 +527,7 @@ if platform.is_aix(): all_targets = [] n.comment('Main executable is library plus main() function.') -objs = cxx('ninja', variables=cxxvariables) +objs = cxx('ninja') ninja = n.build(binary('ninja'), 'link', objs, implicit=ninja_lib, variables=[('libs', libs)]) n.newline() @@ -554,8 +542,6 @@ if options.bootstrap: n.comment('Tests all build into ninja_test executable.') objs = [] -if platform.is_msvc(): - cxxvariables = [('pdb', 'ninja_test.pdb')] for name in ['build_log_test', 'build_test', @@ -574,10 +560,10 @@ for name in ['build_log_test', 'subprocess_test', 'test', 'util_test']: - objs += cxx(name, variables=cxxvariables) + objs += cxx(name) if platform.is_windows(): for name in ['includes_normalize_test', 'msvc_helper_test']: - objs += cxx(name, variables=cxxvariables) + objs += cxx(name) ninja_test = n.build(binary('ninja_test'), 'link', objs, implicit=ninja_lib, variables=[('libs', libs)]) @@ -593,9 +579,7 @@ for name in ['build_log_perftest', 'hash_collision_bench', 'manifest_parser_perftest', 'clparser_perftest']: - if platform.is_msvc(): - cxxvariables = [('pdb', name + '.pdb')] - objs = cxx(name, variables=cxxvariables) + objs = cxx(name) all_targets += n.build(binary(name), 'link', objs, implicit=ninja_lib, variables=[('libs', libs)]) |