From 550df413158b32645ca5df4dcaabc67f1a48964d Mon Sep 17 00:00:00 2001
From: Arno Leist <mail@arno-leist.de>
Date: Wed, 3 May 2017 14:34:24 +1200
Subject: [PATCH] Added -D_GLIBCXX_USE_CXX11_ABI=0 to bazel build (#9607)
* Added -D_GLIBCXX_USE_CXX11_ABI=0 to bazel build
Fixes issues with missing symbols when compiling with GCC 5.x. See
issue tensorflow/tensorflow#1419.
* Split lines to keep line length under 80 chars
---
tensorflow/tools/docker/Dockerfile.devel | 3 ++-
tensorflow/tools/docker/Dockerfile.devel-gpu | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index bfac54c6019..a0e0f88d9df 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -92,7 +92,8 @@ WORKDIR /tensorflow
ENV CI_BUILD_PYTHON python
RUN tensorflow/tools/ci_build/builds/configured CPU \
- bazel build -c opt tensorflow/tools/pip_package:build_pip_package && \
+ bazel build -c opt --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" \
+ tensorflow/tools/pip_package:build_pip_package && \
bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/pip && \
pip --no-cache-dir install --upgrade /tmp/pip/tensorflow-*.whl && \
rm -rf /tmp/pip && \
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 7726cbdfbf8..743c05ef887 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -92,7 +92,8 @@ ENV TF_NEED_CUDA 1
ENV TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2,6.0,6.1
RUN tensorflow/tools/ci_build/builds/configured GPU \
- bazel build -c opt --config=cuda tensorflow/tools/pip_package:build_pip_package && \
+ bazel build -c opt --config=cuda --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" \
+ tensorflow/tools/pip_package:build_pip_package && \
bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/pip && \
pip --no-cache-dir install --upgrade /tmp/pip/tensorflow-*.whl && \
rm -rf /tmp/pip && \