diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 23:26:29 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 23:26:29 +0000 |
| commit | b96fc5dc177d311db220dc4039e74a9c0d871558 (patch) | |
| tree | 9bbc6ea3af7c0da75d4b6025d4b475dd62eec0b2 /build/internal | |
| parent | db8635032b1f83436a072be14e425076a7bd8164 (diff) | |
| download | chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.zip chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.tar.gz chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.tar.bz2 | |
Convert from using env['PLATFORM'] directly to using the more flexible
and better-thought-out Hammer env.Bits() idioms:
* env['PLATFORM'] == 'win32' => env.Bit('windows')
* env['PLATFORM'] == 'posix' => env.Bit('linux')
* env['PLATFORM'] == 'darwin' => env.Bit('mac')
New idioms:
* env.Bit('posix') => really does mean "any POSIX platform"
* env.AnyBits('mac', 'linux') => specifically mac or linux, excluding
other POSIX platforms
Where we were using compound conditionals (e.g., "env['PLATFORM'] in
('posix', 'darwin')") I tried to take my best shot at translating
the intent (i.e., "env.Bits('posix')" for something POSIX, "not
env.Bits('mac')" for something not yet ported to Mac, etc.)
Review URL: http://codereview.chromium.org/15051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/internal')
| -rw-r--r-- | build/internal/essential.scons | 6 | ||||
| -rw-r--r-- | build/internal/release_impl_dom_stats.scons | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build/internal/essential.scons b/build/internal/essential.scons index bca07f2..547f73a 100644 --- a/build/internal/essential.scons +++ b/build/internal/essential.scons @@ -21,7 +21,7 @@ env.Append( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): incremental = env.get('INCREMENTAL') if incremental is not None: if incremental: @@ -110,7 +110,7 @@ if env['PLATFORM'] == 'win32': '/EH', # VCCLCompilerTool.ExceptionHandling="0" ], ) -elif env['PLATFORM'] == 'posix': +elif env.Bit('linux'): pass -elif env['PLATFORM'] == 'mac': +elif env.Bit('mac'): pass diff --git a/build/internal/release_impl_dom_stats.scons b/build/internal/release_impl_dom_stats.scons index ec55585..9dae238 100644 --- a/build/internal/release_impl_dom_stats.scons +++ b/build/internal/release_impl_dom_stats.scons @@ -17,7 +17,7 @@ env.Append( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Replace( CHROMIUM_LINK_OPT_FLAGS = [ '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" |