| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 62aa480bd3469ca861770dc7b5ad84acceeada2a..047e444787fb5984b9ed03dd2ef47876e48b7a5a 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -3981,9 +3981,16 @@
|
| 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
|
| # Keep pch files below xcodebuild/.
|
| 'SHARED_PRECOMPS_DIR': '$(CONFIGURATION_BUILD_DIR)/SharedPrecompiledHeaders',
|
| -
|
| - # -fno-strict-aliasing, see http://crbug.com/32204
|
| - 'GCC_STRICT_ALIASING': 'NO',
|
| + 'OTHER_CFLAGS': [
|
| + # Someday this can be replaced by an 'GCC_STRICT_ALIASING': 'NO'
|
| + # xcode_setting, but not until all downstream projects' mac bots are
|
| + # using xcode >= 4.6, because that's when the default value of the
|
| + # flag in the compiler switched. Pre-4.6, the value 'NO' for that
|
| + # setting is a no-op as far as xcode is concerned, but the compiler
|
| + # behaves differently based on whether -fno-strict-aliasing is
|
| + # specified or not.
|
| + '-fno-strict-aliasing', # See http://crbug.com/32204.
|
| + ],
|
| },
|
| 'target_conditions': [
|
| ['_type=="executable"', {
|
|
|