tree: 14fa52eada8ebec399c3acfc748e924e4492634b [path history] [tgz]
  1. README.md
  2. android_config_test.go
  3. bisect_flag.go
  4. bisect_flag_test.go
  5. build.py
  6. bundle.README
  7. bundle.py
  8. ccache_flag.go
  9. ccache_flag_test.go
  10. clang_flags.go
  11. clang_flags_test.go
  12. clang_syntax_flag.go
  13. clang_syntax_flag_test.go
  14. clang_tidy_flag.go
  15. clang_tidy_flag_test.go
  16. command.go
  17. command_test.go
  18. compile_with_fallback.go
  19. compile_with_fallback_test.go
  20. compiler_wrapper.go
  21. compiler_wrapper_test.go
  22. config.go
  23. config_test.go
  24. cros_hardened_config_test.go
  25. cros_host_config_test.go
  26. cros_llvm_next_flags.go
  27. cros_nonhardened_config_test.go
  28. disable_werror_flag.go
  29. disable_werror_flag_test.go
  30. env.go
  31. env_test.go
  32. errors.go
  33. errors_test.go
  34. gcc_flags.go
  35. gcc_flags_test.go
  36. go_exec.go
  37. goldenutil_test.go
  38. gomacc_flag.go
  39. gomacc_flag_test.go
  40. install_compiler_wrapper.sh
  41. libc_exec.go
  42. main.go
  43. pie_flags.go
  44. pie_flags_test.go
  45. print_cmdline_flag.go
  46. print_cmdline_flag_test.go
  47. print_config_flag.go
  48. print_config_flag_test.go
  49. rusage_flag.go
  50. rusage_flag_test.go
  51. sanitizer_flags.go
  52. sanitizer_flags_test.go
  53. stackprotector_flags.go
  54. stackprotector_flags_test.go
  55. sysroot_flag.go
  56. sysroot_flag_test.go
  57. testdata/
  58. testutil_test.go
  59. thumb_flags.go
  60. thumb_flags_test.go
  61. unsupported_flags.go
  62. unsupported_flags_test.go
  63. x64_flags.go
  64. x64_flags_test.go
compiler_wrapper/README.md

Compiler wrapper

See the comments on the top of main.go. Build is split into 2 steps via separate commands:

  • bundle: copies the sources and the build.py file into a folder.
  • build: builds the actual go binary, assuming it is executed from the folder created by bundle.py.

This allows to copy the sources to a Chrome OS / Android package, including the build script, and then build from there without a dependency on toolchain-utils itself.

Testing Inside the Chroot

To test updates to the wrapper locally:

Run install_compiler_wrapper.sh to install the new wrapper in the chroot:

(chroot) ~/trunk/src/third_party/toolchain-utils/compiler_wrapper/install_compiler_wrapper.sh

Then perform the tests, e.g. build with the new compiler.

Updating the Wrapper for Chrome OS

To update the wrapper for everyone, the new wrapper configuration must be copied into chromiumos-overlay, and new revisions of the gcc and llvm ebuilds must be created.

Copy over sources and build.py to chromiumos-overlay:

(chroot) /mnt/host/source/src/third_party/chromiumos-overlay/sys-devel/llvm/files/update_compiler_wrapper.sh

Rename chromiumos-overlay/sys-devel/llvm/llvm-${VERSION}.ebuild to the next revision number. For example, if the current version is 11.0_pre394483_p20200618-r2:

(chroot) cd ~/trunk/src/third_party/chromiumos-overlay
(chroot) git mv llvm-11.0_pre394483_p20200618-r2.ebuild llvm-11.0_pre394483_p20200618-r3.ebuild

Rename chromiumos-overlay/sys-devel/gcc/gcc-${VERSION}.ebuild to the next revision number. For example, if the current version is 4.9.2-r254:

(chroot) cd ~/trunk/src/third_party/chromiumos-overlay
(chroot) git mv sys-devel/gcc/gcc-4.9.2-r254.ebuild sys-devel/gcc/gcc-4.9.2-r255.ebuild

Edit the new ebuild file and change the number at the end to match the new revision:

-# If you need to force a cros_workon uprev, change this number (you can use next
-# uprev): 254
+# If you need to force a cros_workon uprev, change this number (you can use next
+# uprev): 255

Commit those changes together with the changes made by update_compiler_wrapper.sh.

The changes can then be reviewed and submitted through the normal process.

Paths

build.py is called by these ebuilds:

  • third_party/chromiumos-overlay/sys-devel/llvm/llvm-*.ebuild
  • third_party/chromiumos-overlay/sys-devel/gcc/gcc-*.ebuild

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
  • Sysroot wrapper without ccache: /usr/x86_64-pc-linux-gnu/<arch>/gcc-bin/4.9.x/sysroot_wrapper.hardened.noccache
  • Clang host wrapper: /usr/bin/clang_host_wrapper
  • Gcc host wrapper: /usr/x86_64-pc-linux-gnu/gcc-bin/4.9.x/host_wrapper