languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-04 18:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[build] Use Fuchsia windows clang toolchain"

Browse source 
This reverts commit e479049467.

Reason for revert: Broke build on vm-fuchsia-release-x64.

Original change's description:
> [build] Use Fuchsia windows clang toolchain
>
> Change-Id: Ie04039c736f40174cc45a61aa637a88fa53d9024
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/201862
> Reviewed-by: Alexander Thomas <athom@google.com>

TBR=aam@google.com,athom@google.com

Change-Id: I3f1ce2c30bf0600b025bc95a051e569660e140c0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/204582
Reviewed-by: Tess Strickland <sstrickl@google.com>
Commit-Queue: Tess Strickland <sstrickl@google.com>
This commit is contained in:
Tess Strickland 2021-06-23 08:45:04 +00:00 committed by commit-bot@chromium.org
parent e479049467
commit fc9383ed41
5 changed files with 23 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
DEPS
View file

@ -63,7 +63,7 @@ vars = {
# The list of revisions for these tools comes from Fuchsia, here:
# https://fuchsia.googlesource.com/integration/+/HEAD/prebuilts
# If there are problems with the toolchain, contact fuchsia-toolchain@.
"clang_revision": "7c4e9a68264ffeef6178865be76c45c4fb6390af",
"clang_revision": "3dc24bc31edbc01dea085b24a6a6b024d7ae531c",
"gn_revision": "39a87c0b36310bdf06b692c098f199a0d97fc810",
# Scripts that make 'git cl format' work.
@ -199,6 +199,16 @@ deps = {
Var("chromium_git") + "/chromium/llvm-project/cfe/tools/clang-format.git" +
"@" + Var("clang_format_scripts_rev"),
Var("dart_root") + "/third_party/llvm-build/Release+Asserts": {
"packages": [
{
"package": "flutter/clang/win-amd64",
"version": "git_revision:5ec206df8534d2dd8cb9217c3180e5ddba587393"
}
],
"condition": "download_windows_deps",
"dep_type": "cipd",
},
Var("dart_root") + "/benchmarks-internal": {
"url": Var("dart_internal_git") + "/benchmarks-internal.git" +
"@" + Var("benchmarks_internal_rev"),
@ -486,35 +496,15 @@ deps = {
Var("dart_root") + "/third_party/pkg/yaml":
Var("dart_git") + "yaml.git" + "@" + Var("yaml_rev"),
Var("dart_root") + "/buildtools/linux-x64/clang": {
Var("dart_root") + "/buildtools/" + Var("host_os") + "-x64/clang": {
"packages": [
{
"package": "fuchsia/third_party/clang/linux-amd64",
"version": "git_revision:" + Var("clang_revision"),
},
],
"condition": "host_cpu == x64 and host_os == linux",
"dep_type": "cipd",
},
Var("dart_root") + "/buildtools/mac-x64/clang": {
"packages": [
{
"package": "fuchsia/third_party/clang/mac-amd64",
"package": "fuchsia/third_party/clang/" + Var("host_os") + "-amd64",
"version": "git_revision:" + Var("clang_revision"),
},
],
# TODO(https://fxbug.dev/73385): Use arm64 toolchain on arm64 when it exists.
"condition": "host_cpu == x64 and host_os == mac or host_cpu == arm64 and host_os == mac",
"dep_type": "cipd",
},
Var("dart_root") + "/buildtools/win-x64/clang": {
"packages": [
{
"package": "fuchsia/third_party/clang/windows-amd64",
"version": "git_revision:" + Var("clang_revision"),
},
],
"condition": "host_cpu == x64 and host_os == win",
"condition": "host_cpu == x64 and (host_os == linux or host_os == mac) or host_cpu == arm64 and host_os == mac",
"dep_type": "cipd",
},
Var("dart_root") + "/buildtools/linux-arm64/clang": {

5
build/config/compiler/BUILD.gn
View file

@ -552,10 +552,7 @@ if (is_win) {
]
if (is_clang) {
default_warning_flags += [
"-Wno-tautological-constant-compare",
"-Wno-unused-but-set-variable", # icu
]
default_warning_flags += [ "-Wno-tautological-constant-compare" ]
} else {
default_warning_flags +=
[ "-Wno-ignored-qualifiers" ] # Warnings in BoringSSL headers

6
build/sanitizers/BUILD.gn
View file

@ -6,10 +6,12 @@ if (is_linux && !is_chromeos) {
# TODO(GYP): Figure out which of these work and are needed on other platforms.
copy("copy_llvm_symbolizer") {
if (is_win) {
sources = [ "//buildtools/win-x64/clang/bin/llvm-symbolizer.exe" ]
sources =
[ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer.exe" ]
outputs = [ "$root_out_dir/llvm-symbolizer.exe" ]
} else {
sources = [ "//buildtools/win-x64/clang/bin/llvm-symbolizer" ]
sources =
[ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer" ]
outputs = [ "$root_out_dir/llvm-symbolizer" ]
}
}

6
build/toolchain/win/BUILD.gn
View file

@ -260,7 +260,8 @@ if (current_cpu == "x86") {
msvc_toolchain("clang_x86") {
environment = "environment.x86"
current_cpu = "x86"
prefix = rebase_path("//buildtools/win-x64/clang/bin", root_build_dir)
prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
root_build_dir)
cl = "${goma_prefix}$prefix/clang-cl.exe"
is_clang = true
}
@ -276,7 +277,8 @@ if (current_cpu == "x64") {
msvc_toolchain("clang_x64") {
environment = "environment.x64"
current_cpu = "x64"
prefix = rebase_path("//buildtools/win-x64/clang/bin", root_build_dir)
prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
root_build_dir)
cl = "${goma_prefix}$prefix/clang-cl.exe"
is_clang = true
}

1
third_party/tcmalloc/BUILD.gn vendored
View file

@ -16,7 +16,6 @@ config("internal_config") {
"-Wno-unused-result",
"-Wno-unused-parameter",
"-Wno-unused-function",
"-Wno-unused-but-set-variable",
"-Wno-vla",
"-g3",
"-ggdb3",