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 /sdch | |
| 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 'sdch')
| -rw-r--r-- | sdch/SConscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sdch/SConscript b/sdch/SConscript index dbb0e55..e931984 100644 --- a/sdch/SConscript +++ b/sdch/SConscript @@ -12,7 +12,7 @@ cpppath = [ '$OPEN_VCDIFF_DIR/src', ] -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): cpppath.append('$OPEN_VCDIFF_DIR/vsprojects') env.Prepend(CPPPATH = cpppath) @@ -33,7 +33,7 @@ input_files = [ env.ChromeStaticLibrary('sdch', input_files) -if env['PLATFORM'] in ('posix', 'darwin'): +if env.Bit('posix'): # Generate a target config.h file from a source config.h.in file. # @@ -73,14 +73,14 @@ if env['PLATFORM'] in ('posix', 'darwin'): 'STDC_HEADERS', ] - if env['PLATFORM'] == 'posix': + if env.Bit('linux'): defines.extend([ 'HAVE_MALLOC_H', 'HAVE_MEMALIGN', 'HAVE_POSIX_MEMALIGN', ]) - if env['PLATFORM'] == 'darwin': + if env.Bit('mac'): defines.extend([ 'HAVE_WORKING_KQUEUE', ]) |