commit bf4c1316b579a94245923af9d6b9cdaea2e99ded
author Brian Silverman <bsilver16384@gmail.com> Sun Jan 12 11:35:45 2020 -0800
committer Brian Silverman <bsilver16384@gmail.com> Tue Jan 14 21:36:24 2020 -0800
tree 795226861554cd8d8c7ea0d545f60ea6a5a049c8
parent f98b0ff25bdf0745de775d4b02d15e732813e7a3

Use a Raspbian sysroot for armhf-debian builds

This has a newer libc than the linaro toolchain we were using, which is
necessary for using some prebuilt shared objects.

Change-Id: Id4bcf3b1a18300aa40c77cda60050e3987e81dd1

tools/cpp/static_crosstool.pb

diff --git a/tools/cpp/static_crosstool.pb b/tools/cpp/static_crosstool.pb
index 8552dff..7261677 100644
--- a/tools/cpp/static_crosstool.pb
+++ b/tools/cpp/static_crosstool.pb
@@ -939,7 +939,7 @@
 
   compiler_flag: "-target"
   compiler_flag: "armv7a-arm-linux-gnueabif"
-  compiler_flag: "--sysroot=external/linaro_linux_gcc_repo/arm-linux-gnueabihf/libc"
+  compiler_flag: "--sysroot=external/armhf_debian_rootfs"
   compiler_flag: "-mfloat-abi=hard"
   compiler_flag: "-mfpu=vfpv3-d16"
 
@@ -957,27 +957,29 @@
   compiler_flag: "-isystem"
   compiler_flag: "external/linaro_linux_gcc_repo/include/c++/7.4.1"
   compiler_flag: "-isystem"
-  compiler_flag: "external/linaro_linux_gcc_repo/arm-linux-gnueabihf/libc/usr/include"
+  compiler_flag: "external/armhf_debian_rootfs/usr/include"
+  compiler_flag: "-isystem"
+  compiler_flag: "external/armhf_debian_rootfs/usr/include/arm-linux-gnueabihf"
+  compiler_flag: "-isystem"
+  compiler_flag: "external/org_frc971/third_party"
 
   cxx_builtin_include_directory: "%package(@linaro_linux_gcc_repo//include)%"
-  cxx_builtin_include_directory: "%package(@linaro_linux_gcc_repo//arm-linux-gnueabihf/libc/usr/include)%"
-  cxx_builtin_include_directory: "%package(@linaro_linux_gcc_repo//arm-linux-gnueabihf/libc/usr/lib/include)%"
-  cxx_builtin_include_directory: "%package(@linaro_linux_gcc_repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/7.4.1/include-fixed)%"
+  cxx_builtin_include_directory: "%package(@armhf_debian_rootfs//usr/include)%"
   cxx_builtin_include_directory: "%package(@linaro_linux_gcc_repo//include)%/c++/7.4.1"
-  cxx_builtin_include_directory: "%package(@linaro_linux_gcc_repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/7.4.1/include)%"
-  cxx_builtin_include_directory: "%package(@linaro_linux_gcc_repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/7.4.1/include-fixed)%"
   cxx_builtin_include_directory: "%package(@linaro_linux_gcc_repo//lib/gcc/arm-linux-gnueabihf/7.4.1/include)%"
   cxx_builtin_include_directory: "%package(@linaro_linux_gcc_repo//lib/gcc/arm-linux-gnueabihf/7.4.1/include-fixed)%"
   cxx_builtin_include_directory: "%package(@linaro_linux_gcc_repo//arm-linux-gnueabihf/include)%/c++/7.4.1"
 
   linker_flag: "-target"
   linker_flag: "armv7a-arm-linux-gnueabif"
-  linker_flag: "--sysroot=external/linaro_linux_gcc_repo/arm-linux-gnueabihf/libc"
+  linker_flag: "--sysroot=external/armhf_debian_rootfs"
   linker_flag: "-lstdc++"
   linker_flag: "-Ltools/cpp/linaro_linux_gcc/clang_more_libs"
-  linker_flag: "-Lexternal/linaro_linux_gcc_repo/arm-linux-gnueabihf/lib"
-  linker_flag: "-Lexternal/linaro_linux_gcc_repo/arm-linux-gnueabihf/libc/lib"
-  linker_flag: "-Lexternal/linaro_linux_gcc_repo/arm-linux-gnueabihf/libc/usr/lib"
+  linker_flag: "-Lexternal/armhf_debian_rootfs/usr/lib/gcc/arm-linux-gnueabihf/8"
+  linker_flag: "-Lexternal/armhf_debian_rootfs/lib/arm-linux-gnueabihf"
+  linker_flag: "-Lexternal/armhf_debian_rootfs/usr/lib/arm-linux-gnueabihf"
+  linker_flag: "-Lexternal/armhf_debian_rootfs/lib"
+  linker_flag: "-Lexternal/armhf_debian_rootfs/usr/lib"
   linker_flag: "-Lexternal/linaro_linux_gcc_repo/lib/gcc/arm-linux-gnueabihf/7.4.1"
   linker_flag: "-Bexternal/linaro_linux_gcc_repo/lib/gcc/arm-linux-gnueabihf/7.4.1"
   linker_flag: "-Bexternal/linaro_linux_gcc_repo/arm-linux-gnueabihf/bin"