diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-15 16:06:35 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-15 16:06:35 +0000 |
| commit | 3f96abd259a9b719df4122ced56cd276501417ee (patch) | |
| tree | 9bf31c13ea734f319c770f941245a756732ab0c4 /base | |
| parent | de3d02bea60d61158ab0ceb3cdd311c46b3b715c (diff) | |
| download | chromium_src-3f96abd259a9b719df4122ced56cd276501417ee.zip chromium_src-3f96abd259a9b719df4122ced56cd276501417ee.tar.gz chromium_src-3f96abd259a9b719df4122ced56cd276501417ee.tar.bz2 | |
Remove few more errors in mac scons build.
BUG=5525
Review URL: http://codereview.chromium.org/14113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base_lib.scons | 8 | ||||
| -rw-r--r-- | base/base_unittests.scons | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/base/base_lib.scons b/base/base_lib.scons index 50e7b99..e2bb18d 100644 --- a/base/base_lib.scons +++ b/base/base_lib.scons @@ -92,9 +92,11 @@ if env_dmg_fp['PLATFORM'] == 'win32': '/wd4554', ], ) -elif env_dmg_fp['PLATFORM'] == 'posix': - env_dmg_fp['CXXFLAGS'].remove('-Wall') - env_dmg_fp['CXXFLAGS'].append('-Wno-write-strings') +elif env_dmg_fp['PLATFORM'] in ('darwin', 'posix'): + for var in ['CCFLAGS', 'CXXFLAGS']: + if '-Wall' in env_dmg_fp[var]: + env_dmg_fp[var].remove('-Wall') + env_dmg_fp[var].append('-Wno-write-strings') input_files.extend([ env_dmg_fp.Object('third_party/dmg_fp/dtoa.cc'), diff --git a/base/base_unittests.scons b/base/base_unittests.scons index 169d8ebb..433fdcce 100644 --- a/base/base_unittests.scons +++ b/base/base_unittests.scons @@ -139,7 +139,6 @@ if env['PLATFORM'] == 'darwin': # Mac-specific tests. input_files.extend([ 'mac_util_unittest.cc', - 'platform_test_mac.mm', ]) env.ChromeTestProgram('base_unittests', input_files) |