Merge pull request #2 from petewarden/tf_master

Hacked around cxx_builtin_include_directory problem in CROSSTOOL
ebrevdo · Jul 23, 2017 · 0efde24 · 0efde24
2 parents cd4008f + 3c379a6
commit 0efde24
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/third_party/toolchains/cpus/arm/CROSSTOOL.tpl b/third_party/toolchains/cpus/arm/CROSSTOOL.tpl
@@ -79,6 +79,13 @@ toolchain {
   cxx_builtin_include_directory: "/usr/include"
 
   cxx_flag: "-std=c++11"	
+  # The cxx_builtin_include_directory directives don't seem to be adding these, so
+  # explicitly set them as flags. There's a query to the Bazel team outstanding about
+  # why this is necessary.
+  cxx_flag: "-isystem"
+  cxx_flag: "/usr/include/python2.7"
+  cxx_flag: "-isystem"
+  cxx_flag: "/usr/include/"
   linker_flag: "-lstdc++"
 
   unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"