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

Side by Side Diff: build/common.gypi

Issue 268363020: clang: Instead of having update.sh clobber out/, add a define with the current revision. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | tools/clang/scripts/update.sh » ('j') | 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 2298 matching lines...) Expand 10 before | Expand all | Expand 10 after
2309 'xcode_settings': { 2309 'xcode_settings': {
2310 'DYLIB_INSTALL_NAME_BASE': '@rpath', 2310 'DYLIB_INSTALL_NAME_BASE': '@rpath',
2311 'LD_RUNPATH_SEARCH_PATHS': [ 2311 'LD_RUNPATH_SEARCH_PATHS': [
2312 # For unbundled binaries. 2312 # For unbundled binaries.
2313 '@loader_path/.', 2313 '@loader_path/.',
2314 # For bundled binaries, to get back from Binary.app/Contents/MacOS. 2314 # For bundled binaries, to get back from Binary.app/Contents/MacOS.
2315 '@loader_path/../../..', 2315 '@loader_path/../../..',
2316 ], 2316 ],
2317 }, 2317 },
2318 }], 2318 }],
2319 ['clang==1 and OS!="win"', {
2320 # This is here so that all files get recompiled after a clang roll and
2321 # when turning clang on or off.
2322 # (defines are passed via the command line, and build systems rebuild
2323 # things when their commandline changes). Nothing should ever read this
2324 # define.
2325 'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh --print-revision)'],
hans 2014/05/08 20:11:21 Could we just shell out to clang and ask it which
Nico 2014/05/08 20:17:29 Since --version prints 3 lines, it'd require some
2326 }],
2319 ['enable_rlz==1', { 2327 ['enable_rlz==1', {
2320 'defines': ['ENABLE_RLZ'], 2328 'defines': ['ENABLE_RLZ'],
2321 }], 2329 }],
2322 ['component=="shared_library"', { 2330 ['component=="shared_library"', {
2323 'defines': ['COMPONENT_BUILD'], 2331 'defines': ['COMPONENT_BUILD'],
2324 }], 2332 }],
2325 ['toolkit_views==1', { 2333 ['toolkit_views==1', {
2326 'defines': ['TOOLKIT_VIEWS=1'], 2334 'defines': ['TOOLKIT_VIEWS=1'],
2327 }], 2335 }],
2328 ['ui_compositor_image_transport==1', { 2336 ['ui_compositor_image_transport==1', {
(...skipping 2917 matching lines...) Expand 10 before | Expand all | Expand 10 after
5246 # settings in target dicts. SYMROOT is a special case, because many other 5254 # settings in target dicts. SYMROOT is a special case, because many other
5247 # Xcode variables depend on it, including variables such as 5255 # Xcode variables depend on it, including variables such as
5248 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5256 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5249 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5257 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5250 # files to appear (when present) in the UI as actual files and not red 5258 # files to appear (when present) in the UI as actual files and not red
5251 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5259 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5252 # and therefore SYMROOT, needs to be set at the project level. 5260 # and therefore SYMROOT, needs to be set at the project level.
5253 'SYMROOT': '<(DEPTH)/xcodebuild', 5261 'SYMROOT': '<(DEPTH)/xcodebuild',
5254 }, 5262 },
5255 } 5263 }
OLDNEW
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698