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 --- .../cros_gcc_host_golden/gcc_maincc_target_specific.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'compiler_wrapper/testdata/cros_gcc_host_golden/gcc_maincc_target_specific.json') diff --git a/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_maincc_target_specific.json b/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_maincc_target_specific.json index c0f9ecdb..6c88c344 100644 --- a/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_maincc_target_specific.json @@ -27,7 +27,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-eabi-gcc", + "path": "./x86_64-cros-eabi-gcc", "args": [ "main.cc" ] @@ -36,7 +36,7 @@ "cmds": [ { "cmd": { - "path": "./x86_64-cros-linux-eabi-gcc.real", + "path": "./x86_64-cros-eabi-gcc.real", "args": [ "-Wno-maybe-uninitialized", "-Wno-unused-local-typedefs", @@ -99,7 +99,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-linux-eabi-gcc", + "path": "./armv7m-cros-eabi-gcc", "args": [ "main.cc" ] @@ -108,7 +108,7 @@ "cmds": [ { "cmd": { - "path": "./armv7m-cros-linux-eabi-gcc.real", + "path": "./armv7m-cros-eabi-gcc.real", "args": [ "-Wno-maybe-uninitialized", "-Wno-unused-local-typedefs", @@ -171,7 +171,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-linux-eabi-gcc", + "path": "./armv8m-cros-eabi-gcc", "args": [ "main.cc" ] @@ -180,7 +180,7 @@ "cmds": [ { "cmd": { - "path": "./armv8m-cros-linux-eabi-gcc.real", + "path": "./armv8m-cros-eabi-gcc.real", "args": [ "-Wno-maybe-uninitialized", "-Wno-unused-local-typedefs", -- cgit v1.2.3