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_noccache_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_noccache_golden')
5 files changed, 32 insertions, 0 deletions
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json index a3eae0c9..5adec383 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json @@ -45,6 +45,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", @@ -108,6 +109,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", @@ -174,6 +176,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_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json index 6150d5d5..ff41cec6 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json @@ -35,6 +35,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", @@ -139,6 +141,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 +194,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", @@ -250,6 +254,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", @@ -315,6 +320,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", @@ -379,6 +385,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", @@ -433,6 +440,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", @@ -482,6 +490,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", @@ -531,6 +540,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 +590,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", @@ -632,6 +643,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_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json index 44b66d3a..d2f22710 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_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_noccache_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json index dda0c1c0..46a56fa4 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json @@ -38,6 +38,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", @@ -90,6 +91,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", @@ -128,6 +130,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", @@ -184,6 +187,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", @@ -222,6 +226,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_noccache_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json index ab43d7a9..0c937f26 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_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", @@ -111,6 +112,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", @@ -186,6 +188,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", @@ -244,6 +247,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", |