diff options
author | Manoj Gupta <manojgupta@google.com> | 2021-02-25 16:28:30 -0800 |
---|---|---|
committer | Manoj Gupta <manojgupta@chromium.org> | 2021-02-26 00:51:56 +0000 |
commit | 412cb5e0bf4286f26726824faffb32b70d66f66b (patch) | |
tree | e98ed0af1c7bc0d88a304d7b6979b873bc71ff69 /compiler_wrapper/testdata/cros_hardened_llvmnext_golden | |
parent | 720f951928a9b8011c6f5a2144e68d936e1a7afc (diff) | |
download | toolchain-utils-412cb5e0bf4286f26726824faffb32b70d66f66b.tar.gz |
compiler_wrapper: pass --prefix argument to clang
ToT clang needs --prefix is needed to find the correct tools.
BUG=chromium:1182224
TEST=Updated compiler wrapper in SimpleChrome, nacl builds.
Change-Id: I8073e1a5482a23f38bb1e0d88e2b31ee2d97fa6e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2721199
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>
Diffstat (limited to 'compiler_wrapper/testdata/cros_hardened_llvmnext_golden')
5 files changed, 32 insertions, 0 deletions
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json index d7af7506..53cc5986 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json @@ -46,6 +46,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -113,6 +114,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -183,6 +185,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", 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 7e8ad0b5..48ab0dd9 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json @@ -36,6 +36,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -94,6 +95,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -152,6 +154,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -210,6 +213,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -275,6 +279,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", @@ -345,6 +350,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", @@ -410,6 +416,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", @@ -470,6 +477,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -525,6 +533,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=a/b/bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -580,6 +589,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=a/b/bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -635,6 +645,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -693,6 +704,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json index 44b66d3a..d2f22710 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json @@ -51,6 +51,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -87,6 +88,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -153,6 +155,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -190,6 +193,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -258,6 +262,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -298,6 +303,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -367,6 +373,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -404,6 +411,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json index eef9fd5e..523d3df4 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json @@ -39,6 +39,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -97,6 +98,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -141,6 +143,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -203,6 +206,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -247,6 +251,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json index fd2c07ba..f3d487ee 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json @@ -36,6 +36,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -116,6 +117,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -191,6 +193,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", @@ -249,6 +252,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", |