diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 02:49:48 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 02:49:48 +0000 |
commit | 22362c7358df89e2c0c94c4dd43ecfe90ac3da27 (patch) | |
tree | 2a94b4354e902675985861013ee8d6a5fb754bd6 /build | |
parent | b4baa53a78c9965eac889056a46d8860f64fd257 (diff) | |
download | chromium_src-22362c7358df89e2c0c94c4dd43ecfe90ac3da27.zip chromium_src-22362c7358df89e2c0c94c4dd43ecfe90ac3da27.tar.gz chromium_src-22362c7358df89e2c0c94c4dd43ecfe90ac3da27.tar.bz2 |
mac: Fix a nesting bug in http://crrev.com/87141
BUG=none
TEST=none
TBR=mark
Review URL: http://codereview.chromium.org/7087016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/common.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index fdbbc88..189d448 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -631,13 +631,13 @@ 'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static) 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static) }], + ['OS=="mac" and clang==1', { + # TODO(thakis): Remove this once http://llvm.org/PR10031 is fixed. + 'mac_release_optimization%': '2', + }], ], }, 'conditions': [ - ['OS=="mac" and clang==1', { - # TODO(thakis): Remove this once http://llvm.org/PR10031 is fixed. - 'mac_release_optimization%': '2', - }], ['branding=="Chrome"', { 'defines': ['GOOGLE_CHROME_BUILD'], }, { # else: branding!="Chrome" |