From 36c19215f13c983c2ae0096ed9170fd064744622 Mon Sep 17 00:00:00 2001 From: Tobias Bosch Date: Mon, 19 Aug 2019 16:30:44 -0700 Subject: Correctly parse eabi compiler names. BUG=chromium:773875 TEST=unit tests, compile cross-armv7m-cros-eabi/newlib Change-Id: Ia98442a69b01cff87c52b6ac84dc39c47d5e998e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1760465 Tested-by: Tobias Bosch Reviewed-by: George Burgess --- .../gcc_maincc_target_specific.json | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json') diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json index ff281966..5efa5ed6 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json @@ -36,7 +36,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-eabi-gcc", + "path": "./x86_64-cros-eabi-gcc", "args": [ "main.cc" ] @@ -47,8 +47,8 @@ "cmd": { "path": "/usr/bin/ccache", "args": [ - "./x86_64-cros-linux-eabi-gcc.real", - "--sysroot=/usr/x86_64-cros-linux-eabi", + "./x86_64-cros-eabi-gcc.real", + "--sysroot=/usr/x86_64-cros-eabi", "-Wno-maybe-uninitialized", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -57,7 +57,7 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-eabi", + "CCACHE_BASEDIR=/usr/x86_64-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -135,7 +135,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-linux-eabi-gcc", + "path": "./armv7m-cros-eabi-gcc", "args": [ "main.cc" ] @@ -146,8 +146,8 @@ "cmd": { "path": "/usr/bin/ccache", "args": [ - "./armv7m-cros-linux-eabi-gcc.real", - "--sysroot=/usr/armv7m-cros-linux-eabi", + "./armv7m-cros-eabi-gcc.real", + "--sysroot=/usr/armv7m-cros-eabi", "-Wno-maybe-uninitialized", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -155,7 +155,7 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-linux-eabi", + "CCACHE_BASEDIR=/usr/armv7m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -233,7 +233,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-linux-eabi-gcc", + "path": "./armv8m-cros-eabi-gcc", "args": [ "main.cc" ] @@ -244,8 +244,8 @@ "cmd": { "path": "/usr/bin/ccache", "args": [ - "./armv8m-cros-linux-eabi-gcc.real", - "--sysroot=/usr/armv8m-cros-linux-eabi", + "./armv8m-cros-eabi-gcc.real", + "--sysroot=/usr/armv8m-cros-eabi", "-Wno-maybe-uninitialized", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -253,7 +253,7 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-linux-eabi", + "CCACHE_BASEDIR=/usr/armv8m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] -- cgit v1.2.3