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

Side by Side Diff: build/common.gypi

Issue 9476013: Fix linking when in a WebKit only checkout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 2002 matching lines...) Expand 10 before | Expand all | Expand 10 after
2013 #'-Wl,--icf=safe', 2013 #'-Wl,--icf=safe',
2014 '-Wl,--icf=none', 2014 '-Wl,--icf=none',
2015 ], 2015 ],
2016 }], 2016 }],
2017 ], 2017 ],
2018 }], 2018 }],
2019 ], 2019 ],
2020 }], 2020 }],
2021 ['linux_use_gold_binary==1', { 2021 ['linux_use_gold_binary==1', {
2022 'variables': { 2022 'variables': {
2023 # We pass the path to gold to the compiler. gyp leaves 2023 'conditions': [
2024 # unspecified what the cwd is when running the compiler, 2024 ['inside_chromium_build==1', {
2025 # so the normal gyp path-munging fails us. This hack 2025 # We pass the path to gold to the compiler. gyp leaves
2026 # gets the right path. 2026 # unspecified what the cwd is when running the compiler,
2027 'gold_path': '<(PRODUCT_DIR)/../../third_party/gold', 2027 # so the normal gyp path-munging fails us. This hack
2028 # gets the right path.
2029 'gold_path': '<(PRODUCT_DIR)/../../third_party/gold',
2030 }, {
2031 'gold_path': '<(PRODUCT_DIR)/../../Source/WebKit/chromium/thir d_party/gold',
Nico 2012/02/27 21:27:38 I thought webkit/chromium standalone isn't really
2032 }]
2033 ]
2028 }, 2034 },
2029 'ldflags': [ 2035 'ldflags': [
2030 # Put our gold binary in the search path for the linker. 2036 # Put our gold binary in the search path for the linker.
2031 '-B<(gold_path)', 2037 '-B<(gold_path)',
2032 ], 2038 ],
2033 }], 2039 }],
2034 ], 2040 ],
2035 }, 2041 },
2036 }], 2042 }],
2037 # FreeBSD-specific options; note that most FreeBSD options are set above, 2043 # FreeBSD-specific options; note that most FreeBSD options are set above,
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
2796 # settings in target dicts. SYMROOT is a special case, because many other 2802 # settings in target dicts. SYMROOT is a special case, because many other
2797 # Xcode variables depend on it, including variables such as 2803 # Xcode variables depend on it, including variables such as
2798 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2804 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2799 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2805 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2800 # files to appear (when present) in the UI as actual files and not red 2806 # files to appear (when present) in the UI as actual files and not red
2801 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2807 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2802 # and therefore SYMROOT, needs to be set at the project level. 2808 # and therefore SYMROOT, needs to be set at the project level.
2803 'SYMROOT': '<(DEPTH)/xcodebuild', 2809 'SYMROOT': '<(DEPTH)/xcodebuild',
2804 }, 2810 },
2805 } 2811 }
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