compiler_wrapper: Update for gcc -> llvm ebuild migration

Update compiler wrapper for migrating the wrappers from
gcc to llvm ebuild.
This assumes that clang wrappers now live in /usr/bin/
instead of /usr/x86-64-pc-linux-gnu/... and is no longer
co-located with gcc wrappers.

BUG=b:186803617
TEST=CQ, SDK tryjobs

Change-Id: I60082913dbf5a3c6ce992ea951955086b280af43
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3046721
Reviewed-by: George Burgess <gbiv@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>

4 files changed, 64 insertions, 64 deletions

diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index df8e2b84..1923c509 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -535,8 +535,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -559,14 +559,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -594,8 +594,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -618,14 +618,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -653,8 +653,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "../../usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "../usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -677,14 +677,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -715,8 +715,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "/usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "/tmp/usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -739,14 +739,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
index a86ab468..1b59a942 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -543,8 +543,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -568,14 +568,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -603,8 +603,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -628,14 +628,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -663,8 +663,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "../../usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "../usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -688,14 +688,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -726,8 +726,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "/usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "/tmp/usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -751,14 +751,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
index f32ac0c6..15140212 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -491,9 +491,9 @@
     "cmds": [
       {
         "cmd": {
-          "path": "a/b/usr/bin/clang",
+          "path": "a/b/c/d/e/usr/bin/clang",
           "args": [
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -516,14 +516,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ]
@@ -544,9 +544,9 @@
     "cmds": [
       {
         "cmd": {
-          "path": "a/b/usr/bin/clang",
+          "path": "a/b/c/d/e/usr/bin/clang",
           "args": [
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -569,14 +569,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ]
@@ -597,9 +597,9 @@
     "cmds": [
       {
         "cmd": {
-          "path": "../../usr/bin/clang",
+          "path": "../usr/bin/clang",
           "args": [
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -622,14 +622,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ]
@@ -653,9 +653,9 @@
     "cmds": [
       {
         "cmd": {
-          "path": "/usr/bin/clang",
+          "path": "/tmp/usr/bin/clang",
           "args": [
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -678,14 +678,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ]
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
index 75ee0ed3..261dfb6b 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -463,8 +463,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fdebug-default-version=5",
             "-Wno-tautological-constant-compare",
@@ -478,14 +478,14 @@
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -513,8 +513,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fdebug-default-version=5",
             "-Wno-tautological-constant-compare",
@@ -528,14 +528,14 @@
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -563,8 +563,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "../../usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "../usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fdebug-default-version=5",
             "-Wno-tautological-constant-compare",
@@ -578,14 +578,14 @@
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -616,8 +616,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "/usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "/tmp/usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fdebug-default-version=5",
             "-Wno-tautological-constant-compare",
@@ -631,14 +631,14 @@
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],