From 08c42ad75df0d351e1fbc8b41fdbe4bdea14161a Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Mon, 26 Nov 2018 20:25:55 +0000 Subject: [PATCH] Revert "[infra] Roll buildtools to c72a1c5aadde06505b7bb4641720880f3db28ff9" This reverts commit c2f1cd49a351b65769dd19a7557723d69a62075b. Reason for revert: Broke android build Original change's description: > [infra] Roll buildtools to c72a1c5aadde06505b7bb4641720880f3db28ff9 > > Change-Id: I277e48e077aa8025e5d6e99fc46895bb57073c1c > Reviewed-on: https://dart-review.googlesource.com/c/84448 > Reviewed-by: Ryan Macnak > Commit-Queue: Zach Anderson TBR=rmacnak@google.com,zra@google.com Change-Id: I460f9bceb3c2e9e53cbed848ed99cb1ac00491cc No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/85422 Reviewed-by: Zach Anderson Commit-Queue: Zach Anderson --- DEPS | 2 +- build/config/compiler/BUILD.gn | 9 +++------ tools/buildtools/update.py | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/DEPS b/DEPS index 717b628adfe..b83815d78d2 100644 --- a/DEPS +++ b/DEPS @@ -42,7 +42,7 @@ vars = { # Fuchsia. This revision should be kept up to date with the revision pulled # by the Flutter engine. If there are problems with the toolchain, contact # fuchsia-toolchain@. - "buildtools_revision": "9e69ccfa6c1d3d9d3d0498c2b73338c169ed4377", + "buildtools_revision": "446d5b1019dcbe7835236dc85261e91cf29a9239", # Scripts that make 'git cl format' work. "clang_format_scripts_rev": "c09c8deeac31f05bd801995c475e7c8070f9ecda", diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 1399fa7ef0e..4bdcda6f75d 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -246,14 +246,11 @@ config("compiler") { ldflags += [ "-pthread" ] if (is_clang) { if (current_cpu == "arm") { - cflags += [ "--target=armv7-linux-gnueabihf" ] - ldflags += [ "--target=armv7-linux-gnueabihf" ] + cflags += [ "--target=arm-linux-gnueabihf" ] + ldflags += [ "--target=arm-linux-gnueabihf" ] } else if (current_cpu == "arm64") { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] - } else if (current_cpu == "x86") { - cflags += [ "--target=i386-linux-gnu" ] - ldflags += [ "--target=i386-linux-gnu" ] } } } @@ -695,7 +692,7 @@ if (is_win) { "-Wl,--gc-sections", ] - if (is_clang && !using_sanitizer) { + if (is_clang) { # Identical code folding to reduce size. # Warning: This changes C/C++ semantics of function pointer comparison. common_optimize_on_ldflags += [ "-Wl,--icf=all" ] diff --git a/tools/buildtools/update.py b/tools/buildtools/update.py index 63de42b21aa..5cae6a82f53 100755 --- a/tools/buildtools/update.py +++ b/tools/buildtools/update.py @@ -24,7 +24,7 @@ DEPOT_PATH = find_depot_tools.add_depot_tools_to_path() def Update(): path = os.path.join(BUILDTOOLS, 'update.sh') - command = ['/bin/bash', path, '--clang', '--gn', '--ninja'] + command = ['/bin/bash', path, '--clang', '--gn'] return subprocess.call(command, cwd=DART_ROOT)