OLD | NEW |
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_overrides/build.gni") | 8 import("//build_overrides/build.gni") |
9 import("//build/config/chrome_build.gni") | 9 import("//build/config/chrome_build.gni") |
10 | 10 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 } | 43 } |
44 | 44 |
45 # The path to the hermetic install of Xcode. Only relevant when | 45 # The path to the hermetic install of Xcode. Only relevant when |
46 # use_system_xcode = false. | 46 # use_system_xcode = false. |
47 hermetic_xcode_path = | 47 hermetic_xcode_path = |
48 rebase_path("//build/${target_os}_files/Xcode.app", "", root_build_dir) | 48 rebase_path("//build/${target_os}_files/Xcode.app", "", root_build_dir) |
49 | 49 |
50 declare_args() { | 50 declare_args() { |
51 if (is_clang) { | 51 if (is_clang) { |
52 # Clang compiler version. Clang files are placed at version-dependent paths. | 52 # Clang compiler version. Clang files are placed at version-dependent paths. |
53 clang_version = "4.0.0" | 53 if (llvm_force_head_revision) { |
| 54 clang_version = "5.0.0" |
| 55 } else { |
| 56 # TODO(thakis): Remove this branch the next time clang rolls. |
| 57 clang_version = "4.0.0" |
| 58 } |
54 } | 59 } |
55 } | 60 } |
56 | 61 |
57 # Check target_os here instead of is_ios as this file is loaded for secondary | 62 # Check target_os here instead of is_ios as this file is loaded for secondary |
58 # toolchain (host toolchain in particular) but the argument is the same for | 63 # toolchain (host toolchain in particular) but the argument is the same for |
59 # all toolchains. | 64 # all toolchains. |
60 assert(!use_xcode_clang || target_os == "ios", | 65 assert(!use_xcode_clang || target_os == "ios", |
61 "Using Xcode's clang is only supported in iOS builds") | 66 "Using Xcode's clang is only supported in iOS builds") |
62 | 67 |
63 # Subdirectory within root_out_dir for shared library files. | 68 # Subdirectory within root_out_dir for shared library files. |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 _tool_wrapper_path = | 111 _tool_wrapper_path = |
107 rebase_path("//build/toolchain/win/tool_wrapper.py", root_build_dir) | 112 rebase_path("//build/toolchain/win/tool_wrapper.py", root_build_dir) |
108 | 113 |
109 stamp_command = "$python_path $_tool_wrapper_path stamp {{output}}" | 114 stamp_command = "$python_path $_tool_wrapper_path stamp {{output}}" |
110 copy_command = | 115 copy_command = |
111 "$python_path $_tool_wrapper_path recursive-mirror {{source}} {{output}}" | 116 "$python_path $_tool_wrapper_path recursive-mirror {{source}} {{output}}" |
112 } else { | 117 } else { |
113 stamp_command = "touch {{output}}" | 118 stamp_command = "touch {{output}}" |
114 copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}}
&& cp -af {{source}} {{output}})" | 119 copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}}
&& cp -af {{source}} {{output}})" |
115 } | 120 } |
OLD | NEW |