OLD | NEW |
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 __doc__ = """ | 5 __doc__ = """ |
6 Configuration for building base.lib / libbase.a. | 6 Configuration for building base.lib / libbase.a. |
7 """ | 7 """ |
8 | 8 |
9 Import('env') | 9 Import('env') |
10 | 10 |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 env_dmg_fp = env.Clone() | 85 env_dmg_fp = env.Clone() |
86 if env_dmg_fp['PLATFORM'] == 'win32': | 86 if env_dmg_fp['PLATFORM'] == 'win32': |
87 env_dmg_fp.Append( | 87 env_dmg_fp.Append( |
88 CCFLAGS = [ | 88 CCFLAGS = [ |
89 '/wd4018', | 89 '/wd4018', |
90 '/wd4102', | 90 '/wd4102', |
91 '/wd4244', | 91 '/wd4244', |
92 '/wd4554', | 92 '/wd4554', |
93 ], | 93 ], |
94 ) | 94 ) |
95 elif env_dmg_fp['PLATFORM'] == 'posix': | 95 elif env_dmg_fp['PLATFORM'] in ('darwin', 'posix'): |
96 env_dmg_fp['CXXFLAGS'].remove('-Wall') | 96 for var in ['CCFLAGS', 'CXXFLAGS']: |
97 env_dmg_fp['CXXFLAGS'].append('-Wno-write-strings') | 97 if '-Wall' in env_dmg_fp[var]: |
| 98 env_dmg_fp[var].remove('-Wall') |
| 99 env_dmg_fp[var].append('-Wno-write-strings') |
98 | 100 |
99 input_files.extend([ | 101 input_files.extend([ |
100 env_dmg_fp.Object('third_party/dmg_fp/dtoa.cc'), | 102 env_dmg_fp.Object('third_party/dmg_fp/dtoa.cc'), |
101 env_dmg_fp.Object('third_party/dmg_fp/g_fmt.cc'), | 103 env_dmg_fp.Object('third_party/dmg_fp/g_fmt.cc'), |
102 ]) | 104 ]) |
103 | 105 |
104 if env['PLATFORM'] in ('posix', 'darwin'): | 106 if env['PLATFORM'] in ('posix', 'darwin'): |
105 # Remove files that still need to be ported from the input_files list. | 107 # Remove files that still need to be ported from the input_files list. |
106 # TODO(port): delete files from this list as they get ported. | 108 # TODO(port): delete files from this list as they get ported. |
107 to_be_ported_files = [ | 109 to_be_ported_files = [ |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 'message_pump_glib.cc', | 208 'message_pump_glib.cc', |
207 'nss_init.cc', | 209 'nss_init.cc', |
208 'process_posix.cc', | 210 'process_posix.cc', |
209 'process_util_linux.cc', | 211 'process_util_linux.cc', |
210 'sys_string_conversions_linux.cc', | 212 'sys_string_conversions_linux.cc', |
211 'test_file_util_linux.cc', | 213 'test_file_util_linux.cc', |
212 'worker_pool.cc', | 214 'worker_pool.cc', |
213 ]) | 215 ]) |
214 | 216 |
215 env.ChromeStaticLibrary('base', input_files) | 217 env.ChromeStaticLibrary('base', input_files) |
OLD | NEW |