diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-26 15:48:43 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-26 15:48:43 +0000 |
| commit | 4588ce85cd19dd9449468cb1ace8ec5225ff692e (patch) | |
| tree | d5a71e82acc7bd4b0f21880606571547017c8139 /gyp | |
| parent | 7b3b26e56cfb645ee613cbdd364ebffe8d09b900 (diff) | |
move the xcode setup for SYMROOT to the outermost level
Review URL: https://codereview.appspot.com/6576050
git-svn-id: http://skia.googlecode.com/svn/trunk@5693 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 2ec0ef8014..14026d72ee 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -180,7 +180,6 @@ }, 'xcode_settings': { 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', - 'SYMROOT': '<(DEPTH)/xcodebuild', 'SDKROOT': '<(skia_osx_sdkroot)', # trying to get this to work, but it needs clang I think... # 'WARNING_CFLAGS': '-Wexit-time-destructors', @@ -231,7 +230,6 @@ 'CODE_SIGNING_REQUIRED': 'NO', 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', - 'SYMROOT': '<(DEPTH)/xcodebuild', 'SDKROOT': 'iphoneos', 'TARGETED_DEVICE_FAMILY': '1,2', 'OTHER_CPLUSPLUSFLAGS': '-fvisibility=hidden -fvisibility-inlines-hidden', @@ -323,6 +321,10 @@ }], ], # end 'conditions' + # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details + 'xcode_settings': { + 'SYMROOT': '<(DEPTH)/xcodebuild', + }, } # Local Variables: |