Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: build/common.gypi

Issue 277273002: Mac OS X build: turn off common word macros in AssertMacros.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: common.gypi instead Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 4503 matching lines...) Expand 10 before | Expand all | Expand 10 after
4514 }], 4514 }],
4515 ], 4515 ],
4516 }], 4516 }],
4517 ], 4517 ],
4518 }], 4518 }],
4519 ], # target_conditions 4519 ], # target_conditions
4520 }, # target_defaults 4520 }, # target_defaults
4521 }], # OS=="mac" or OS=="ios" 4521 }], # OS=="mac" or OS=="ios"
4522 ['OS=="mac"', { 4522 ['OS=="mac"', {
4523 'target_defaults': { 4523 'target_defaults': {
4524 'defines': [
4525 # Prevent Mac OS X AssertMacros.h from defining macros that collide
4526 # with common names, like 'check', 'require', and 'verify'.
4527 # http://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/ AssertMac
Mark Mentovai 2014/05/13 14:29:17 Bad link. Missing “ros.h”.
Nils Barth (inactive) 2014/05/14 00:46:28 (>.<) Thanks, good catch!
4528 '__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0',
4529 ],
4524 'variables': { 4530 'variables': {
4525 # These should end with %, but there seems to be a bug with % in 4531 # These should end with %, but there seems to be a bug with % in
4526 # variables that are intended to be set to different values in 4532 # variables that are intended to be set to different values in
4527 # different targets, like these. 4533 # different targets, like these.
4528 'mac_pie': 1, # Most executables can be position-independent. 4534 'mac_pie': 1, # Most executables can be position-independent.
4529 # Strip debugging symbols from the target. 4535 # Strip debugging symbols from the target.
4530 'mac_strip': '<(mac_strip_release)', 4536 'mac_strip': '<(mac_strip_release)',
4531 'conditions': [ 4537 'conditions': [
4532 ['asan==1', { 4538 ['asan==1', {
4533 'conditions': [ 4539 'conditions': [
(...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after
5279 # settings in target dicts. SYMROOT is a special case, because many other 5285 # settings in target dicts. SYMROOT is a special case, because many other
5280 # Xcode variables depend on it, including variables such as 5286 # Xcode variables depend on it, including variables such as
5281 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5287 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5282 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5288 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5283 # files to appear (when present) in the UI as actual files and not red 5289 # files to appear (when present) in the UI as actual files and not red
5284 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5290 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5285 # and therefore SYMROOT, needs to be set at the project level. 5291 # and therefore SYMROOT, needs to be set at the project level.
5286 'SYMROOT': '<(DEPTH)/xcodebuild', 5292 'SYMROOT': '<(DEPTH)/xcodebuild',
5287 }, 5293 },
5288 } 5294 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698