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

Side by Side Diff: build/common.gypi

Issue 976833002: Revert "Roll Clang 223108:230914" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | content/gpu/gpu_main.cc » ('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 2589 matching lines...) Expand 10 before | Expand all | Expand 10 after
2600 'xcode_settings': { 2600 'xcode_settings': {
2601 'DYLIB_INSTALL_NAME_BASE': '@rpath', 2601 'DYLIB_INSTALL_NAME_BASE': '@rpath',
2602 'LD_RUNPATH_SEARCH_PATHS': [ 2602 'LD_RUNPATH_SEARCH_PATHS': [
2603 # For unbundled binaries. 2603 # For unbundled binaries.
2604 '@loader_path/.', 2604 '@loader_path/.',
2605 # For bundled binaries, to get back from Binary.app/Contents/MacOS. 2605 # For bundled binaries, to get back from Binary.app/Contents/MacOS.
2606 '@loader_path/../../..', 2606 '@loader_path/../../..',
2607 ], 2607 ],
2608 }, 2608 },
2609 }], 2609 }],
2610 ['clang==1 and OS!="win"', { 2610 ['(clang==1 or host_clang==1) and OS!="win"', {
2611 # This is here so that all files get recompiled after a clang roll and 2611 # This is here so that all files get recompiled after a clang roll and
2612 # when turning clang on or off. 2612 # when turning clang on or off.
2613 # (defines are passed via the command line, and build systems rebuild 2613 # (defines are passed via the command line, and build systems rebuild
2614 # things when their commandline changes). Nothing should ever read this 2614 # things when their commandline changes). Nothing should ever read this
2615 # define. 2615 # define.
2616 'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh --print-revision)'], 2616 'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh --print-revision)'],
2617 }], 2617 }],
2618 ['enable_rlz==1', { 2618 ['enable_rlz==1', {
2619 'defines': ['ENABLE_RLZ'], 2619 'defines': ['ENABLE_RLZ'],
2620 }], 2620 }],
(...skipping 3358 matching lines...) Expand 10 before | Expand all | Expand 10 after
5979 # settings in target dicts. SYMROOT is a special case, because many other 5979 # settings in target dicts. SYMROOT is a special case, because many other
5980 # Xcode variables depend on it, including variables such as 5980 # Xcode variables depend on it, including variables such as
5981 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5981 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5982 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5982 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5983 # files to appear (when present) in the UI as actual files and not red 5983 # files to appear (when present) in the UI as actual files and not red
5984 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5984 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5985 # and therefore SYMROOT, needs to be set at the project level. 5985 # and therefore SYMROOT, needs to be set at the project level.
5986 'SYMROOT': '<(DEPTH)/xcodebuild', 5986 'SYMROOT': '<(DEPTH)/xcodebuild',
5987 }, 5987 },
5988 } 5988 }
OLDNEW
« no previous file with comments | « no previous file | content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698