diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 02:15:27 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 02:15:27 +0000 |
| commit | e662e8d9e42d9250ef5ebed4067ecdd146552581 (patch) | |
| tree | 4edc77232f4c681348153a82ef427a6eab26b1e4 /o3d/build | |
| parent | 23763611ff03226f8d5457906def87dfe644a924 (diff) | |
| download | chromium_src-e662e8d9e42d9250ef5ebed4067ecdd146552581.zip chromium_src-e662e8d9e42d9250ef5ebed4067ecdd146552581.tar.gz chromium_src-e662e8d9e42d9250ef5ebed4067ecdd146552581.tar.bz2 | |
Get Mac GYP build compiling.
Review URL: http://codereview.chromium.org/172119
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/common.gypi | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index a164f7c..a011c8e 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -25,6 +25,16 @@ 'defines': [ 'GYP_BUILD', # Needed to make a change in base/types.h conditional. ], + # This needs to be in a target_conditions block in order to successfully + # override the xcode_settings in ../../build/common.gypi. + # Something to do with evaluation order. + 'target_conditions': [ + ['OS=="mac"', { + 'xcode_settings': { + 'MACOSX_DEPLOYMENT_TARGET': '10.4', + }, + }], + ], }, 'conditions' : [ ['OS == "win"', @@ -70,14 +80,16 @@ 'configurations': { 'Debug': { 'xcode_settings': { - 'CFLAGS': ['-g',], +# 'OTHER_CFLAGS': ['-ggdb', '-g',], + 'GCC_DEBUGGING_SYMBOLS': 'full', + 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', }, }, }, 'xcode_settings': { - 'CFLAGS': ['-gstabs+', - '-fno-eliminate-unused-debug-symbols', - '-mmacosx-version-min=10.4'], + 'OTHER_CFLAGS': [ + '-fno-eliminate-unused-debug-symbols', + '-mmacosx-version-min=10.4'], 'WARNING_CFLAGS': ['-Wno-deprecated-declarations'], 'WARNING_CXXFLAGS': ['-Wstrict-aliasing', '-Wno-deprecated',], |