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

Side by Side Diff: build/common.gypi

Issue 932673002: Do not force Xcode clang when targetting arm64 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« 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 2062 matching lines...) Expand 10 before | Expand all | Expand 10 after
2073 ], 2073 ],
2074 # iOS uses a whitelist to filter resources. 2074 # iOS uses a whitelist to filter resources.
2075 'grit_whitelist%': '<(DEPTH)/build/ios/grit_whitelist.txt', 2075 'grit_whitelist%': '<(DEPTH)/build/ios/grit_whitelist.txt',
2076 2076
2077 # Enable host builds when generating with ninja-ios. 2077 # Enable host builds when generating with ninja-ios.
2078 'conditions': [ 2078 'conditions': [
2079 ['"<(GENERATOR)"=="ninja"', { 2079 ['"<(GENERATOR)"=="ninja"', {
2080 'host_os%': "mac", 2080 'host_os%': "mac",
2081 }], 2081 }],
2082 2082
2083 # TODO(sdefresne): Remove the target_subarch check once Apple has
2084 # upstreamed the support for "arm64". http://crbug.com/341453
2085 # TODO(eugenebut): Remove enable_coverage check once 2083 # TODO(eugenebut): Remove enable_coverage check once
2086 # libclang_rt.profile_ios.a is bundled with Chromium's clang. 2084 # libclang_rt.profile_ios.a is bundled with Chromium's clang.
2087 # http://crbug.com/450379 2085 # http://crbug.com/450379
2088 ['target_subarch!="arm32" or enable_coverage or "<(GENERATOR)"=="xcode "', { 2086 ['enable_coverage or "<(GENERATOR)"=="xcode"', {
2089 'clang_xcode%': 1, 2087 'clang_xcode%': 1,
2090 }], 2088 }],
2091 ], 2089 ],
2092 }], 2090 }],
2093 ['enable_extensions==1', { 2091 ['enable_extensions==1', {
2094 'grit_defines': ['-D', 'enable_extensions'], 2092 'grit_defines': ['-D', 'enable_extensions'],
2095 }], 2093 }],
2096 ['enable_plugins!=0', { 2094 ['enable_plugins!=0', {
2097 'grit_defines': ['-D', 'enable_plugins'], 2095 'grit_defines': ['-D', 'enable_plugins'],
2098 }], 2096 }],
(...skipping 3807 matching lines...) Expand 10 before | Expand all | Expand 10 after
5906 # settings in target dicts. SYMROOT is a special case, because many other 5904 # settings in target dicts. SYMROOT is a special case, because many other
5907 # Xcode variables depend on it, including variables such as 5905 # Xcode variables depend on it, including variables such as
5908 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5906 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5909 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5907 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5910 # files to appear (when present) in the UI as actual files and not red 5908 # files to appear (when present) in the UI as actual files and not red
5911 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5909 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5912 # and therefore SYMROOT, needs to be set at the project level. 5910 # and therefore SYMROOT, needs to be set at the project level.
5913 'SYMROOT': '<(DEPTH)/xcodebuild', 5911 'SYMROOT': '<(DEPTH)/xcodebuild',
5914 }, 5912 },
5915 } 5913 }
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