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

Side by Side Diff: build/common.gypi

Issue 15785007: Add $(inherited) to the conditional OTHER_LDFLAGS settings to prevent them from masking (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 6 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 4106 matching lines...) Expand 10 before | Expand all | Expand 10 after
4117 'OTHER_LDFLAGS': [ 4117 'OTHER_LDFLAGS': [
4118 '-force_load', 4118 '-force_load',
4119 '<(arc_toolchain_path)/libarclite_iphonesimulator.a' , 4119 '<(arc_toolchain_path)/libarclite_iphonesimulator.a' ,
4120 ], 4120 ],
4121 }, 4121 },
4122 }], 4122 }],
4123 # Xcode sets target_arch at compile-time. 4123 # Xcode sets target_arch at compile-time.
4124 ['"<(GENERATOR)"=="xcode"', { 4124 ['"<(GENERATOR)"=="xcode"', {
4125 'xcode_settings': { 4125 'xcode_settings': {
4126 'OTHER_LDFLAGS[arch=armv7]': [ 4126 'OTHER_LDFLAGS[arch=armv7]': [
4127 '$(inherited)',
4127 '-force_load', 4128 '-force_load',
4128 '<(arc_toolchain_path)/libarclite_iphoneos.a', 4129 '<(arc_toolchain_path)/libarclite_iphoneos.a',
4129 ], 4130 ],
4130 'OTHER_LDFLAGS[arch=i386]': [ 4131 'OTHER_LDFLAGS[arch=i386]': [
4132 '$(inherited)',
4131 '-force_load', 4133 '-force_load',
4132 '<(arc_toolchain_path)/libarclite_iphonesimulator.a' , 4134 '<(arc_toolchain_path)/libarclite_iphonesimulator.a' ,
4133 ], 4135 ],
4134 }, 4136 },
4135 }], 4137 }],
4136 ], 4138 ],
4137 }], 4139 }],
4138 ], 4140 ],
4139 }], 4141 }],
4140 ], 4142 ],
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
4520 # settings in target dicts. SYMROOT is a special case, because many other 4522 # settings in target dicts. SYMROOT is a special case, because many other
4521 # Xcode variables depend on it, including variables such as 4523 # Xcode variables depend on it, including variables such as
4522 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4524 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4523 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4525 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4524 # files to appear (when present) in the UI as actual files and not red 4526 # files to appear (when present) in the UI as actual files and not red
4525 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4527 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4526 # and therefore SYMROOT, needs to be set at the project level. 4528 # and therefore SYMROOT, needs to be set at the project level.
4527 'SYMROOT': '<(DEPTH)/xcodebuild', 4529 'SYMROOT': '<(DEPTH)/xcodebuild',
4528 }, 4530 },
4529 } 4531 }
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