From 19854d11fa53db17149f538c9b78b3286c61c23e Mon Sep 17 00:00:00 2001
From: Hidenori Matsubayashi <Hidenori.Matsubayashi@sony.com>
Date: Thu, 12 Nov 2020 17:40:48 +0900
Subject: [PATCH 1/2] Change readelf, nm, readelf, etc path in
 clang_x86/clang_x64. Change to match dart-sdk in x86/x64.

---
 build/toolchain/linux/BUILD.gn | 40 +++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
index ee23fe7d8a..956dc3311f 100644
--- a/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn
@@ -40,11 +40,11 @@ gcc_toolchain("clang_x86") {
   }
   cc = "${compiler_prefix}$prefix/clang"
   cxx = "${compiler_prefix}$prefix/clang++"
-  readelf = "readelf"
-  nm = "nm"
-  ar = "ar"
+  readelf = "${prefix}/llvm-readelf"
+  nm = "${prefix}/llvm-nm"
+  ar = "${prefix}/llvm-ar"
   ld = cxx
-  strip = "strip"
+  llvm_objcopy = "${prefix}/llvm-objcopy"
 
   toolchain_cpu = "x86"
   toolchain_os = "linux"
@@ -52,13 +52,15 @@ gcc_toolchain("clang_x86") {
 }
 
 gcc_toolchain("x86") {
-  cc = "${compiler_prefix}gcc"
-  cxx = "${compiler_prefix}g++"
+  prefix = ""
+  cc = "${compiler_prefix}${prefix}gcc"
+  cxx = "${compiler_prefix}${prefix}g++"
 
-  readelf = "readelf"
-  nm = "nm"
-  ar = "ar"
+  readelf = "${prefix}readelf"
+  nm = "${prefix}nm"
+  ar = "${prefix}ar"
   ld = cxx
+  strip = "${prefix}strip"
 
   toolchain_cpu = "x86"
   toolchain_os = "linux"
@@ -75,11 +77,11 @@ gcc_toolchain("clang_x64") {
   cc = "${compiler_prefix}$prefix/clang"
   cxx = "${compiler_prefix}$prefix/clang++"
 
-  readelf = "readelf"
-  nm = "nm"
-  ar = "ar"
+  readelf = "${prefix}/llvm-readelf"
+  nm = "${prefix}/llvm-nm"
+  ar = "${prefix}/llvm-ar"
   ld = cxx
-  strip = "strip"
+  llvm_objcopy = "${prefix}/llvm-objcopy"
 
   toolchain_cpu = "x64"
   toolchain_os = "linux"
@@ -108,13 +110,15 @@ gcc_toolchain("clang_arm64") {
 }
 
 gcc_toolchain("x64") {
-  cc = "${compiler_prefix}gcc"
-  cxx = "${compiler_prefix}g++"
+  prefix = ""
+  cc = "${compiler_prefix}${prefix}gcc"
+  cxx = "${compiler_prefix}${prefix}g++"
 
-  readelf = "readelf"
-  nm = "nm"
-  ar = "ar"
+  readelf = "${prefix}readelf"
+  nm = "${prefix}nm"
+  ar = "${prefix}ar"
   ld = cxx
+  strip = "${prefix}strip"
 
   toolchain_cpu = "x64"
   toolchain_os = "linux"

From 403b381e24ccddad718e9bc2a6e68a9e86552954 Mon Sep 17 00:00:00 2001
From: Hidenori Matsubayashi <Hidenori.Matsubayashi@sony.com>
Date: Fri, 13 Nov 2020 10:16:44 +0900
Subject: [PATCH 2/2] format

---
 build/toolchain/linux/BUILD.gn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
index 956dc3311f..b345f54f31 100644
--- a/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn
@@ -40,6 +40,7 @@ gcc_toolchain("clang_x86") {
   }
   cc = "${compiler_prefix}$prefix/clang"
   cxx = "${compiler_prefix}$prefix/clang++"
+
   readelf = "${prefix}/llvm-readelf"
   nm = "${prefix}/llvm-nm"
   ar = "${prefix}/llvm-ar"