diff options
| author |  Pete Warden <pete@petewarden.com> | 2017-09-22 19:47:28 -0700 |
|---|---|---|
| committer |  gunan <gunan@google.com> | 2017-09-22 19:47:28 -0700 |
| commit | 02a2eba057be6327e2f62e19ef3d7e5c92f30e40 (patch) | |
| tree | 552329c7e315c2c1d4ae3d87b26642660a838a94 /third_party/toolchains/cpus | |
| parent | b19cf25c5536f218bfe6c91a5a262061b8ea37ce (diff) | |
Fix for RTLD_GLOBAL breakage of Pi builds, and removed Eigen version change that's no longer needed (#13251)
* Fix for RTLD_GLOBAL breakage of Pi builds, and removed Eigen version change for Pi that's no longer needed
* Fixed Pi Zero OpenBLAS build problems and tidied up directories used
* More robust checks in Pi build script
Diffstat (limited to 'third_party/toolchains/cpus')
| -rw-r--r-- | third_party/toolchains/cpus/arm/CROSSTOOL.tpl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/toolchains/cpus/arm/CROSSTOOL.tpl b/third_party/toolchains/cpus/arm/CROSSTOOL.tpl index 04e399bed1..ad7f5596d0 100644 --- a/third_party/toolchains/cpus/arm/CROSSTOOL.tpl +++ b/third_party/toolchains/cpus/arm/CROSSTOOL.tpl @@ -77,7 +77,9 @@ toolchain { cxx_builtin_include_directory: "%{ARM_COMPILER_PATH}%/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed" cxx_builtin_include_directory: "%{ARM_COMPILER_PATH}%/local_include" cxx_builtin_include_directory: "/usr/include" - cxx_builtin_include_directory: "/workspace/toolchain/openblas/include/" + # The path below must match the one used in + # tensorflow/tools/ci_build/pi/build_raspberry_pi.sh. + cxx_builtin_include_directory: "/tmp/openblas_install/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 |