diff options
| author | Manoj Gupta <manojgupta@google.com> | 2021-07-22 18:13:55 -0700 |
|---|---|---|
| committer | Manoj Gupta <manojgupta@chromium.org> | 2021-07-24 21:44:13 +0000 |
| commit | 3796acfe14d0493ebc14db93f0ca8dbd39e17b75 (patch) | |
| tree | 430f574cba1f19da37c3b8da1d88bca7fe47a661 /compiler_wrapper/testdata/cros_hardened_golden/clang_path.json | |
| parent | e5d02c07357346fba77126e43fc092af01ae5d7e (diff) | |
| download | toolchain-utils-3796acfe14d0493ebc14db93f0ca8dbd39e17b75.tar.gz | |
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>
Diffstat (limited to 'compiler_wrapper/testdata/cros_hardened_golden/clang_path.json')
| -rw-r--r-- | compiler_wrapper/testdata/cros_hardened_golden/clang_path.json | 32 |
1 files changed, 16 insertions, 16 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" ], |