diff options
author | Manoj Gupta <manojgupta@google.com> | 2021-08-06 14:53:51 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-08-07 06:05:40 +0000 |
commit | 046d57a5e2567e6c6b9880f8c2be476c9a5fc433 (patch) | |
tree | 916890c38ffae872709205008baa142e88649679 /compiler_wrapper | |
parent | 50dc9b85377b18c52ec1943a86f88fd43ad81ae5 (diff) | |
download | toolchain-utils-046d57a5e2567e6c6b9880f8c2be476c9a5fc433.tar.gz |
compiler_wrapper: Update install script
Update wrapper installation script now that we have
separate clang and gcc wrappers.
BUG=b:186803617
TEST=run install_compiler_wrapper.sh
Change-Id: I14ee2ffc6f74adb9699066a54dbead98e2f2e220
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3078693
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Commit-Queue: George Burgess <gbiv@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Auto-Submit: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Jian Cai <jiancai@google.com>
Diffstat (limited to 'compiler_wrapper')
-rwxr-xr-x | compiler_wrapper/install_compiler_wrapper.sh | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/compiler_wrapper/install_compiler_wrapper.sh b/compiler_wrapper/install_compiler_wrapper.sh index 479b112c..3a5b7417 100755 --- a/compiler_wrapper/install_compiler_wrapper.sh +++ b/compiler_wrapper/install_compiler_wrapper.sh @@ -19,7 +19,16 @@ sudo mv ./clang_host_wrapper /usr/bin/clang_host_wrapper echo "/usr/bin/clang_host_wrapper" sudo cp ../binary_search_tool/bisect_driver.py /usr/bin echo "/usr/bin/clang_host_wrapper/bisect_driver.py" + # Update the target wrappers +./build.py --config=cros.hardened --use_ccache=false --use_llvm_next=false --output_file=./sysroot_wrapper.hardened.noccache +./build.py --config=cros.hardened --use_ccache=true --use_llvm_next=false --output_file=./sysroot_wrapper.hardened.ccache +# Update clang target wrappers. +sudo cp ./sysroot_wrapper.hardened.noccache ./sysroot_wrapper.hardened.ccache /usr/bin +echo "Updated clang wrapper /usr/bin/sysroot_wrapper.hardened.noccache" +echo "Updated clang wrapper /usr/bin/sysroot_wrapper.hardened.ccache" + +# Update GCC target wrappers. for GCC in cross-x86_64-cros-linux-gnu/gcc cross-armv7a-cros-linux-gnueabihf/gcc cross-aarch64-cros-linux-gnu/gcc; do if ! FILES="$(equery f ${GCC})"; then if [[ $(equery l "${GCC}" 2>&1 | wc -c) -eq 0 ]]; then @@ -29,12 +38,12 @@ for GCC in cross-x86_64-cros-linux-gnu/gcc cross-armv7a-cros-linux-gnueabihf/gcc # Something went wrong, and the equery above probably complained about it. exit 1 fi - ./build.py --config=cros.hardened --use_ccache=false --use_llvm_next=false --output_file=./sysroot_wrapper.hardened.noccache - sudo mv ./sysroot_wrapper.hardened.noccache "$(grep sysroot_wrapper.hardened.noccache <<< "${FILES}")" + echo "Updating ${GCC} wrapper." + sudo cp ./sysroot_wrapper.hardened.noccache "$(grep sysroot_wrapper.hardened.noccache <<< "${FILES}")" grep sysroot_wrapper.hardened.noccache <<< "${FILES}" - ./build.py --config=cros.hardened --use_ccache=true --use_llvm_next=false --output_file=./sysroot_wrapper.hardened.ccache - sudo mv ./sysroot_wrapper.hardened.ccache "$(grep sysroot_wrapper.hardened.ccache <<< "${FILES}")" + sudo cp ./sysroot_wrapper.hardened.ccache "$(grep sysroot_wrapper.hardened.ccache <<< "${FILES}")" grep sysroot_wrapper.hardened.ccache <<< "${FILES}" sudo cp ../binary_search_tool/bisect_driver.py "$(grep bisect_driver.py <<< "${FILES}")" grep bisect_driver.py <<< "${FILES}" done +rm -f ./sysroot_wrapper.hardened.noccache ./sysroot_wrapper.hardened.ccache |