DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

use a single clang toolchain (flutter/engine#23842)

Browse Source
This commit is contained in:
Chase Latta 2021-01-25 13:23:04 -08:00 committed by GitHub
parent 0176b01d38
commit 74c7cac41a
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
DEPS
View File

@ -100,7 +100,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '7832e9ed954bd5b22d043ab49a67e93babd291e6',
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e664d190b83ba911194a8a9517ae5f8bba3fcfaa',
# Fuchsia compatibility
#
@ -547,16 +547,6 @@ deps = {
'condition': 'host_os == "mac"',
'dep_type': 'cipd',
},
'src/fuchsia/toolchain/mac': {
'packages': [
{
'package': 'fuchsia/third_party/clang/mac-amd64',
'version': 'git_revision:2c0536b76b35fa592ac7b4a0e4bb176eaf55af75'
}
],
'condition': 'host_os == "mac"',
'dep_type': 'cipd',
},
'src/fuchsia/sdk/linux': {
'packages': [
{
@ -567,16 +557,6 @@ deps = {
'condition': 'host_os == "linux"',
'dep_type': 'cipd',
},
'src/fuchsia/toolchain/linux': {
'packages': [
{
'package': 'fuchsia/third_party/clang/linux-amd64',
'version': '8LaTdqf7wY_sjaptz0DIIKx9_Nxaoh3YgDEPgnfxzOEC'
}
],
'condition': 'host_os == "linux"',
'dep_type': 'cipd',
},
}
hooks = [

2
engine/src/flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn
View File

@ -21,7 +21,7 @@ template("generate_dart_profiler_symbols") {
args = [
"--nm",
rebase_path("//fuchsia/toolchain/$host_os/bin/llvm-nm"),
rebase_path("//buildtools/${host_os}-${host_cpu}/clang/bin/llvm-nm"),
"--binary",
rebase_path(invoker.library_path),
"--output",

2
engine/src/flutter/tools/fuchsia/clang.gni
View File

@ -5,7 +5,7 @@
declare_args() {
# The default clang toolchain provided by the prebuilt. This variable is
# additionally consumed by the Go toolchain.
clang_base = rebase_path("//fuchsia/toolchain/$host_os/lib")
clang_base = rebase_path("//buildtools/${host_os}-${host_cpu}/clang/lib")
}
if (current_cpu == "arm64") {

2
engine/src/flutter/tools/fuchsia/fuchsia_debug_symbols.gni
View File

@ -33,7 +33,7 @@ template("_copy_debug_symbols") {
"--destination-base",
rebase_path(_dest_base),
"--read-elf",
rebase_path("//fuchsia/toolchain/$host_os/bin/llvm-readelf"),
rebase_path("//buildtools/${host_os}-${host_cpu}/clang/bin/llvm-readelf"),
]
if (unstripped) {