From 3305608d1fae517995349d6276545891374c4e92 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 4 Jul 2017 11:54:39 -0600 Subject: [PATCH 1/2] ARM toolchain fixes --- chromium/build/toolchain/linux/BUILD.gn | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/chromium/build/toolchain/linux/BUILD.gn b/chromium/build/toolchain/linux/BUILD.gn index 64face8eff5..55a707835f4 100644 --- a/chromium/build/toolchain/linux/BUILD.gn +++ b/chromium/build/toolchain/linux/BUILD.gn @@ -30,15 +30,13 @@ clang_toolchain("clang_arm64") { } gcc_toolchain("arm64") { - toolprefix = "aarch64-linux-gnu-" - - cc = "${toolprefix}gcc" - cxx = "${toolprefix}g++" + cc = "gcc" + cxx = "g++" - ar = "${toolprefix}ar" + ar = "ar" ld = cxx - readelf = "${toolprefix}readelf" - nm = "${toolprefix}nm" + readelf = "readelf" + nm = "nm" toolchain_args = { current_cpu = "arm64" @@ -51,15 +49,13 @@ gcc_toolchain("arm64") { } gcc_toolchain("arm") { - toolprefix = "arm-linux-gnueabihf-" - - cc = "${toolprefix}gcc" - cxx = "${toolprefix}g++" + cc = "gcc" + cxx = "g++" - ar = "${toolprefix}ar" + ar = "ar" ld = cxx - readelf = "${toolprefix}readelf" - nm = "${toolprefix}nm" + readelf = "readelf" + nm = "nm" toolchain_args = { current_cpu = "arm" -- 2.37.3