Chromium Code Reviews| 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/config/chrome_build.gni") | 8 import("//build/config/chrome_build.gni") |
| 9 | 9 |
| 10 declare_args() { | 10 declare_args() { |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 39 # Compile with Xcode version of clang instead of hermetic version shipped | 39 # Compile with Xcode version of clang instead of hermetic version shipped |
| 40 # with the build. Used on iOS to ship official builds (as they are built | 40 # with the build. Used on iOS to ship official builds (as they are built |
| 41 # with the version of clang shipped with Xcode). | 41 # with the version of clang shipped with Xcode). |
| 42 use_xcode_clang = is_ios && is_official_build | 42 use_xcode_clang = is_ios && is_official_build |
| 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 = true | 49 use_system_xcode = "" |
| 50 } | |
| 51 | |
| 52 if (is_mac && use_system_xcode == "") { | |
| 53 _result = | |
| 54 exec_script("//build/mac/should_use_hermetic_xcode.py", [], "list lines") | |
| 55 use_system_xcode = _result[0] == "0" | |
|
Dirk Pranke
2016/10/18 01:51:58
If you use "value" instead of "list lines" you can
erikchen
2016/10/18 20:35:39
Done.
| |
| 50 } | 56 } |
| 51 | 57 |
| 52 # The path to the hermetic install of Xcode. Only relevant when | 58 # The path to the hermetic install of Xcode. Only relevant when |
| 53 # use_system_xcode = false. | 59 # use_system_xcode = false. |
| 54 hermetic_xcode_path = | 60 hermetic_xcode_path = |
| 55 rebase_path("//build/mac_files/Xcode.app", "", root_build_dir) | 61 rebase_path("//build/mac_files/Xcode.app", "", root_build_dir) |
| 56 | 62 |
| 57 declare_args() { | 63 declare_args() { |
| 58 if (is_clang) { | 64 if (is_clang) { |
| 59 # Clang compiler version. Clang files are placed at version-dependent paths. | 65 # Clang compiler version. Clang files are placed at version-dependent paths. |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 113 _tool_wrapper_path = | 119 _tool_wrapper_path = |
| 114 rebase_path("//build/toolchain/win/tool_wrapper.py", root_build_dir) | 120 rebase_path("//build/toolchain/win/tool_wrapper.py", root_build_dir) |
| 115 | 121 |
| 116 stamp_command = "$python_path $_tool_wrapper_path stamp {{output}}" | 122 stamp_command = "$python_path $_tool_wrapper_path stamp {{output}}" |
| 117 copy_command = | 123 copy_command = |
| 118 "$python_path $_tool_wrapper_path recursive-mirror {{source}} {{output}}" | 124 "$python_path $_tool_wrapper_path recursive-mirror {{source}} {{output}}" |
| 119 } else { | 125 } else { |
| 120 stamp_command = "touch {{output}}" | 126 stamp_command = "touch {{output}}" |
| 121 copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})" | 127 copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})" |
| 122 } | 128 } |
| OLD | NEW |