Files
gvisor/tools/crosstool-arm-dirs.patch
Andrei Vagin 14a9d751d6 crosstool: add /usr/lib/gcc-cross/ to the toolchain
This should fix the compile time error:
ERROR: Compiling absl/base/log_severity.cc failed: absolute path
inclusion(s) found in rule '@@com_google_absl//absl/base:log_severity':
the source file 'absl/base/log_severity.cc' includes the following
non-builtin files with absolute paths (if these are builtin files, make
sure these paths are in your toolchain):
  '/usr/lib/gcc-cross/x86_64-linux-gnu/11/include/stddef.h'
  '/usr/lib/gcc-cross/x86_64-linux-gnu/11/include/stdarg.h'
  '/usr/lib/gcc-cross/x86_64-linux-gnu/11/include/stdint.h'
  '/usr/lib/gcc-cross/x86_64-linux-gnu/11/include/limits.h'
  '/usr/lib/gcc-cross/x86_64-linux-gnu/11/include/syslimits.h'
2024-10-11 17:56:03 -07:00

22 lines
1.1 KiB
Diff

diff --git a/cc_toolchain_config.bzl.tpl b/cc_toolchain_config.bzl.tpl
index e864fa2..3de0405 100644
--- a/cc_toolchain_config.bzl.tpl
+++ b/cc_toolchain_config.bzl.tpl
@@ -76,6 +76,8 @@ CXX_BUILTIN_INCLUDE_DIRECTORIES = {
"/usr/lib/gcc/x86_64-linux-gnu/%d/include-fixed" % GCC_VERSION,
"/usr/include/x86_64-linux-gnu",
"/usr/include",
+ "/usr/x86_64-linux-gnu/include/",
+ "/usr/lib/gcc-cross/x86_64-linux-gnu/%d/include/" % GCC_VERSION,
],
"armv7a": [
"/usr/arm-linux-gnueabihf/include/c++/%d" % GCC_VERSION,
@@ -100,6 +101,7 @@ CXX_BUILTIN_INCLUDE_DIRECTORIES = {
"/usr/aarch64-linux-gnu/include/c++/%d" % GCC_VERSION,
"/usr/aarch64-linux-gnu/include/c++/%d/aarch64-linux-gnu" % GCC_VERSION,
"/usr/aarch64-linux-gnu/include/c++/%d/backward" % GCC_VERSION,
+ "/usr/lib/gcc/aarch64-linux-gnu/%d/include" % GCC_VERSION,
"/usr/lib/gcc-cross/aarch64-linux-gnu/%d/include" % GCC_VERSION,
"/usr/lib/gcc-cross/aarch64-linux-gnu/%d/include-fixed" % GCC_VERSION,
"/usr/aarch64-linux-gnu/include",