diff options
| author | Jian Cai <jiancai@google.com> | 2020-07-17 16:38:54 -0700 |
|---|---|---|
| committer | Jian Cai <jiancai@google.com> | 2020-07-18 03:54:19 +0000 |
| commit | 916add28cdd83fddfb7f0a1c274b25b9547c2ebb (patch) | |
| tree | dfa8a7229279e47cdbdbb520ca28de4587b64eb1 | |
| parent | 94fd622c652b7aa46f2ca24d3a0efe93c7fde040 (diff) | |
| download | toolchain-utils-916add28cdd83fddfb7f0a1c274b25b9547c2ebb.tar.gz | |
compiler_wrapper: rename update_compiler_wrapper.sh
Rename the script to install_compiler_wrapper.sh to avoid confusion with
chromiumos-overlay/sys-devel/llvm/files/update_compiler_wrapper.sh.
BUG=None.
Test=None.
Change-Id: I39bbc3dc4a63fa480c394f2e92c1723033cdc321
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2304726
Tested-by: Jian Cai <jiancai@google.com>
Reviewed-by: Bob Haarman <inglorion@chromium.org>
| -rw-r--r-- | compiler_wrapper/README.md | 22 | ||||
| -rwxr-xr-x | compiler_wrapper/install_compiler_wrapper.sh (renamed from compiler_wrapper/update_compiler_wrapper.sh) | 0 |
2 files changed, 14 insertions, 8 deletions
diff --git a/compiler_wrapper/README.md b/compiler_wrapper/README.md index 794e1635..e64f01b6 100644 --- a/compiler_wrapper/README.md +++ b/compiler_wrapper/README.md @@ -12,25 +12,31 @@ package, including the build script, and then build from there without a dependency on toolchain-utils itself. -## Update Chrome OS +## Update source files Copy over sources and `build.py` to Chrome OS: ``` -(chroot) /mnt/host/source/src/third_party/chromiumos-overlay/sys-devel/llvm/files/update_compiler_wrapper.sh +(chroot) /mnt/host/source/src/third_party/chromiumos-overlay/sys-devel/llvm/files/update\_compiler\_wrapper.sh ``` `build.py` is called by these ebuilds: -- third_party/chromiumos-overlay/sys-devel/llvm/llvm-9.0_pre361749_p20190714.ebuild -- third_party/chromiumos-overlay/sys-devel/gcc/gcc-*.ebuild +- third_party/chromiumos-overlay/sys-devel/llvm/llvm-11.0\_pre394483\_p20200618-r3.ebuild +- third_party/chromiumos-overlay/sys-devel/gcc/gcc-\*.ebuild +## Update compiler wrappers +``` +(chroot) /mnt/host/source/src/third|_party/toolchain-utils/compiler\_wrapper/install\_compiler\_wrapper.sh +``` Generated wrappers are stored here: - Sysroot wrapper with ccache: - `/usr/x86_64-pc-linux-gnu/<arch>/gcc-bin/4.9.x/sysroot_wrapper.hardened.ccache` + `/usr/x86_64-pc-linux-gnu/<arch>/gcc-bin/4.9.x/sysroot\_wrapper.hardened.ccache` - Sysroot wrapper without ccache: - `/usr/x86_64-pc-linux-gnu/<arch>/gcc-bin/4.9.x/sysroot_wrapper.hardened.noccache` + `/usr/x86_64-pc-linux-gnu/<arch>/gcc-bin/4.9.x/sysroot\_wrapper.hardened.noccache` - Clang host wrapper: - `/usr/bin/clang_host_wrapper` + `/usr/bin/clang\_host\_wrapper` - Gcc host wrapper: - `/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.x/host_wrapper` + `/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.x/host\_wrapper` + + diff --git a/compiler_wrapper/update_compiler_wrapper.sh b/compiler_wrapper/install_compiler_wrapper.sh index 479b112c..479b112c 100755 --- a/compiler_wrapper/update_compiler_wrapper.sh +++ b/compiler_wrapper/install_compiler_wrapper.sh |