sets the c lang dialect outside patch

lhelontra · Jan 27, 2018 · 81ea243 · 81ea243
1 parent a0a533a
commit 81ea243
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/build_tensorflow/configs/beagle_black.conf b/build_tensorflow/configs/beagle_black.conf
@@ -22,7 +22,7 @@ BAZEL_VERSION="0.5.4"
 # BAZEL_PATCH="yes"
 
 BAZEL_COPT_FLAGS="--copt=-march=armv7-a --copt=-mtune=cortex-a8 --copt=-mfpu=neon --copt=-mfloat-abi=hard"
-BAZEL_COPT_FLAGS+=" --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
+BAZEL_COPT_FLAGS+=" --copt=-std=c++11 --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
 BAZEL_COPT_FLAGS+=" --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1"
 BAZEL_COPT_FLAGS+=" --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8"
 BAZEL_COPT_FLAGS+=" --config=monolithic --copt=-funsafe-math-optimizations"

diff --git a/build_tensorflow/configs/odroidc1.conf b/build_tensorflow/configs/odroidc1.conf
@@ -22,7 +22,7 @@ BAZEL_VERSION="0.5.4"
 # BAZEL_PATCH="yes"
 
 BAZEL_COPT_FLAGS="--copt=-mcpu=cortex-a5 --copt=-mfpu=neon-vfpv4 --copt=-mfloat-abi=hard"
-BAZEL_COPT_FLAGS+=" --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
+BAZEL_COPT_FLAGS+=" --copt=-std=c++11 --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
 BAZEL_COPT_FLAGS+=" --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1"
 BAZEL_COPT_FLAGS+=" --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8"
 BAZEL_COPT_FLAGS+=" --config=monolithic --copt=-funsafe-math-optimizations"

diff --git a/build_tensorflow/configs/odroidc2.conf b/build_tensorflow/configs/odroidc2.conf
@@ -22,7 +22,7 @@ BAZEL_VERSION="0.5.4"
 # BAZEL_PATCH="yes"
 
 BAZEL_COPT_FLAGS="--copt=-march=armv8-a+crc+simd --copt=-mtune=cortex-a53"
-BAZEL_COPT_FLAGS+=" --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
+BAZEL_COPT_FLAGS+=" --copt=-std=c++11 --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
 BAZEL_COPT_FLAGS+=" --config=monolithic --copt=-funsafe-math-optimizations"
 BAZEL_COPT_FLAGS+=" --copt=-ftree-vectorize --copt=-fomit-frame-pointer --copt=-DRASPBERRY_PI"
 BAZEL_EXTRA_FLAGS="--cpu=armeabi --crosstool_top=//tools/local_arm_compiler:toolchain //tensorflow/tools/pip_package:build_pip_package"

diff --git a/build_tensorflow/configs/rpi.conf b/build_tensorflow/configs/rpi.conf
@@ -22,7 +22,7 @@ BAZEL_VERSION="0.5.4"
 # BAZEL_PATCH="yes"
 
 BAZEL_COPT_FLAGS="--copt=-march=armv7-a --copt=-mfpu=neon-vfpv4 --copt=-mfloat-abi=hard"
-BAZEL_COPT_FLAGS+=" --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
+BAZEL_COPT_FLAGS+=" --copt=-std=c++11 --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
 BAZEL_COPT_FLAGS+=" --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1"
 BAZEL_COPT_FLAGS+=" --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8"
 BAZEL_COPT_FLAGS+=" --config=monolithic --copt=-funsafe-math-optimizations"

diff --git a/build_tensorflow/configs/rpi_one.conf b/build_tensorflow/configs/rpi_one.conf
@@ -22,7 +22,7 @@ BAZEL_VERSION="0.5.4"
 # BAZEL_PATCH="yes"
 
 BAZEL_COPT_FLAGS="--copt=-march=armv6 --copt=-mfpu=vfp"
-BAZEL_COPT_FLAGS+=" --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
+BAZEL_COPT_FLAGS+=" --copt=-std=c++11 --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
 BAZEL_COPT_FLAGS+=" --config=monolithic --copt=-funsafe-math-optimizations"
 BAZEL_COPT_FLAGS+=" --copt=-ftree-vectorize --copt=-fomit-frame-pointer --copt=-DRASPBERRY_PI"
 BAZEL_EXTRA_FLAGS="--cpu=armeabi --crosstool_top=//tools/local_arm_compiler:toolchain //tensorflow/tools/pip_package:build_pip_package"

diff --git a/build_tensorflow/configs/rpi_one_openblas.conf b/build_tensorflow/configs/rpi_one_openblas.conf
@@ -26,7 +26,7 @@ BAZEL_VERSION="0.5.4"
 # BAZEL_PATCH="yes"
 
 BAZEL_COPT_FLAGS="--copt=-march=armv6 --copt=-mfpu=vfp --copt=-DUSE_GEMM_FOR_CONV --copt=-DUSE_OPENBLAS"
-BAZEL_COPT_FLAGS+=" --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
+BAZEL_COPT_FLAGS+=" --copt=-std=c++11 --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR"
 BAZEL_COPT_FLAGS+=" --config=monolithic --copt=-funsafe-math-optimizations"
 BAZEL_COPT_FLAGS+=" --copt=-ftree-vectorize --copt=-fomit-frame-pointer --copt=-DRASPBERRY_PI"
 BAZEL_COPT_FLAGS+=" --copt=-isystem --copt=${OPENBLAS_PATH}/include/ --linkopt=-L${OPENBLAS_PATH}/lib/ --linkopt=-l:libopenblas.a"

diff --git a/build_tensorflow/patch.sh b/build_tensorflow/patch.sh
@@ -270,13 +270,13 @@ index 000000000..3ff006da8
 +  cxx_builtin_include_directory: "/usr/include/$CROSSTOOL_NAME"
 +  cxx_builtin_include_directory: "$CROSSTOOL_EXTRA_INCLUDE"
 +
-+  cxx_flag: "-std=c++11"
 +  cxx_flag: "-isystem"
 +  cxx_flag: "/usr/include"
 +  cxx_flag: "-isystem"
 +  cxx_flag: "/usr/include/$CROSSTOOL_NAME"
 +  linker_flag: "-lstdc++"
 +
++
 +  unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
 +  unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
 +  unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""