Remove /usr/lib/clang/6.0/include from crosstool
The armhf-debian compiler was leaking out and using the host includes.
Remove that from the list.
Change-Id: I4b0643e6c7d446910fa1704bb2d4f9a63e19d99c
diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index 511196b..5bdf8f8 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -920,8 +920,6 @@
compiler_flag: "-mfpu=vfpv3-d16"
compiler_flag: "-nostdinc"
compiler_flag: "-isystem"
- compiler_flag: "/usr/lib/clang/6.0/include"
- compiler_flag: "-isystem"
compiler_flag: "external/linaro_linux_gcc_repo/lib/gcc/arm-linux-gnueabihf/7.4.1/include"
compiler_flag: "-isystem"
compiler_flag: "external/linaro_linux_gcc_repo/lib/gcc/arm-linux-gnueabihf/7.4.1/include-fixed"
@@ -1000,7 +998,6 @@
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"
- cxx_builtin_include_directory: "/usr/lib/clang/6.0/include"
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
diff --git a/tools/cpp/static_crosstool.pb b/tools/cpp/static_crosstool.pb
index 5121911..8b46fe7 100644
--- a/tools/cpp/static_crosstool.pb
+++ b/tools/cpp/static_crosstool.pb
@@ -945,8 +945,6 @@
compiler_flag: "-nostdinc"
compiler_flag: "-isystem"
- compiler_flag: "/usr/lib/clang/6.0/include"
- compiler_flag: "-isystem"
compiler_flag: "external/linaro_linux_gcc_repo/lib/gcc/arm-linux-gnueabihf/7.4.1/include"
compiler_flag: "-isystem"
compiler_flag: "external/linaro_linux_gcc_repo/lib/gcc/arm-linux-gnueabihf/7.4.1/include-fixed"
@@ -971,7 +969,6 @@
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"
- cxx_builtin_include_directory: '/usr/lib/clang/6.0/include'
linker_flag: "-target"
linker_flag: "armv7a-arm-linux-gnueabif"