From b96fc5dc177d311db220dc4039e74a9c0d871558 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Thu, 18 Dec 2008 23:26:29 +0000 Subject: 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 --- third_party/libjpeg/libjpeg.scons | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/libjpeg') diff --git a/third_party/libjpeg/libjpeg.scons b/third_party/libjpeg/libjpeg.scons index fdb2c2a..16b6bc3 100644 --- a/third_party/libjpeg/libjpeg.scons +++ b/third_party/libjpeg/libjpeg.scons @@ -41,14 +41,14 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Append( CCFLAGS = [ '/TC', '/wd4800', ], ) -elif env['PLATFORM'] == 'posix': +elif env.Bit('linux'): if '-Wall' in env['CCFLAGS']: # We're not responsible for bad warning hygiene in this third party code. env['CCFLAGS'].remove('-Wall') -- cgit v1.1