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

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

Issue 2487643002: Revert of Turn on hermetic toolchain for all corp machines. (Closed)
Patch Set: Created 4 years, 1 month 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/mac_toolchain.py ('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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 # Use the system install of Xcode for tools like ibtool, libtool, etc. 44 # Use the system install of Xcode for tools like ibtool, libtool, etc.
45 # This does not affect the compiler. When this variable is false, targets will 45 # This does not affect the compiler. When this variable is false, targets will
46 # instead use a hermetic install of Xcode. [The hermetic install can be 46 # instead use a hermetic install of Xcode. [The hermetic install can be
47 # obtained with gclient sync after setting the environment variable 47 # obtained with gclient sync after setting the environment variable
48 # FORCE_MAC_TOOLCHAIN]. 48 # FORCE_MAC_TOOLCHAIN].
49 use_system_xcode = "" 49 use_system_xcode = ""
50 } 50 }
51 51
52 if ((is_mac || is_ios) && use_system_xcode == "") { 52 if ((is_mac || is_ios) && use_system_xcode == "") {
53 _result = exec_script("//build/mac/should_use_hermetic_xcode.py", [], "value") 53 _result = getenv("FORCE_MAC_TOOLCHAIN")
54 use_system_xcode = _result == 0 54 use_system_xcode = _result == ""
55 } 55 }
56 56
57 # The path to the hermetic install of Xcode. Only relevant when 57 # The path to the hermetic install of Xcode. Only relevant when
58 # use_system_xcode = false. 58 # use_system_xcode = false.
59 hermetic_xcode_path = 59 hermetic_xcode_path =
60 rebase_path("//build/mac_files/Xcode.app", "", root_build_dir) 60 rebase_path("//build/mac_files/Xcode.app", "", root_build_dir)
61 61
62 declare_args() { 62 declare_args() {
63 if (is_clang) { 63 if (is_clang) {
64 # Clang compiler version. Clang files are placed at version-dependent paths. 64 # Clang compiler version. Clang files are placed at version-dependent paths.
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 _tool_wrapper_path = 118 _tool_wrapper_path =
119 rebase_path("//build/toolchain/win/tool_wrapper.py", root_build_dir) 119 rebase_path("//build/toolchain/win/tool_wrapper.py", root_build_dir)
120 120
121 stamp_command = "$python_path $_tool_wrapper_path stamp {{output}}" 121 stamp_command = "$python_path $_tool_wrapper_path stamp {{output}}"
122 copy_command = 122 copy_command =
123 "$python_path $_tool_wrapper_path recursive-mirror {{source}} {{output}}" 123 "$python_path $_tool_wrapper_path recursive-mirror {{source}} {{output}}"
124 } else { 124 } else {
125 stamp_command = "touch {{output}}" 125 stamp_command = "touch {{output}}"
126 copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})" 126 copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})"
127 } 127 }
OLDNEW
« no previous file with comments | « build/mac_toolchain.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698