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

Side by Side Diff: build/toolchain/toolchain.gni

Issue 2209713002: Fix compilation with Xcode version of clang. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change conditional. Created 4 years, 4 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 | « build/toolchain/mac/BUILD.gn ('k') | 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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 # Toolchain-related configuration that may be needed outside the context of the 5 # Toolchain-related configuration that may be needed outside the context of the
6 # toolchain() rules themselves. 6 # toolchain() rules themselves.
7 7
8 import("//build/config/chrome_build.gni") 8 import("//build/config/chrome_build.gni")
9 9
10 declare_args() { 10 declare_args() {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 clang_version = "3.9.0" 42 clang_version = "3.9.0"
43 43
44 if (llvm_force_head_revision) { 44 if (llvm_force_head_revision) {
45 # TODO(hans): Remove after next Clang roll. 45 # TODO(hans): Remove after next Clang roll.
46 # ToT Clang has a higher version number. 46 # ToT Clang has a higher version number.
47 clang_version = "4.0.0" 47 clang_version = "4.0.0"
48 } 48 }
49 } 49 }
50 } 50 }
51 51
52 assert(!use_xcode_clang || is_ios, 52 # Check target_os here instead of is_ios as this file is loaded for secondary
53 # toolchain (host toolchain in particular) but the argument is the same for
54 # all toolchains.
55 assert(!use_xcode_clang || target_os == "ios",
53 "Using Xcode's clang is only supported in iOS builds") 56 "Using Xcode's clang is only supported in iOS builds")
54 57
55 # Subdirectory within root_out_dir for shared library files. 58 # Subdirectory within root_out_dir for shared library files.
56 # TODO(agrieve): GYP sets this to "lib" for Linux & Android, but this won't work 59 # TODO(agrieve): GYP sets this to "lib" for Linux & Android, but this won't work
57 # in GN until support for loadable_module() is added. 60 # in GN until support for loadable_module() is added.
58 # See: https://codereview.chromium.org/1236503002/ 61 # See: https://codereview.chromium.org/1236503002/
59 shlib_subdir = "." 62 shlib_subdir = "."
60 63
61 # Root out dir for shared library files. 64 # Root out dir for shared library files.
62 root_shlib_dir = root_out_dir 65 root_shlib_dir = root_out_dir
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 stamp_description = "STAMP {{output}}" 98 stamp_description = "STAMP {{output}}"
96 copy_description = "COPY {{source}} {{output}}" 99 copy_description = "COPY {{source}} {{output}}"
97 if (host_os == "win") { 100 if (host_os == "win") {
98 stamp_command = "$python_path gyp-win-tool stamp {{output}}" 101 stamp_command = "$python_path gyp-win-tool stamp {{output}}"
99 copy_command = 102 copy_command =
100 "$python_path gyp-win-tool recursive-mirror {{source}} {{output}}" 103 "$python_path gyp-win-tool recursive-mirror {{source}} {{output}}"
101 } else { 104 } else {
102 stamp_command = "touch {{output}}" 105 stamp_command = "touch {{output}}"
103 copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})" 106 copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})"
104 } 107 }
OLDNEW
« no previous file with comments | « build/toolchain/mac/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698