Skip to content

Commit 98b34b0

Browse files
committed
Update build. Move copts to bazelrc rather than on individual libraries
PiperOrigin-RevId: 272778672
1 parent f653236 commit 98b34b0

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

oss_scripts/configure.sh

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ else
2828
pip install tensorflow==1.14.0
2929
fi
3030

31+
osname="$(uname -s)"
32+
if [[ $osname == "Linux" ]]; then
33+
write_to_bazelrc "build --cxxopt='-std=c++11'"
34+
fi
35+
3136
TF_CFLAGS=( $(python -c 'import tensorflow as tf; print(" ".join(tf.sysconfig.get_compile_flags()))') )
3237
TF_LFLAGS=( $(python -c 'import tensorflow as tf; print(" ".join(tf.sysconfig.get_link_flags()))') )
3338
TF_LFLAGS2=( $(python -c 'import tensorflow as tf; print(" ".join(tf.sysconfig.get_link_flags()))' | awk '{print $2}') )

tensorflow_text/BUILD

-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ cc_binary(
3939
],
4040
copts = [
4141
"-pthread",
42-
"-std=c++11",
4342
],
4443
linkshared = 1,
4544
deps = [
@@ -118,7 +117,6 @@ cc_binary(
118117
],
119118
copts = [
120119
"-pthread",
121-
"-std=c++11",
122120
],
123121
linkshared = 1,
124122
deps = [
@@ -234,7 +232,6 @@ cc_binary(
234232
],
235233
copts = [
236234
"-pthread",
237-
"-std=c++11",
238235
],
239236
linkshared = 1,
240237
deps = [
@@ -338,7 +335,6 @@ cc_binary(
338335
],
339336
copts = [
340337
"-pthread",
341-
"-std=c++11",
342338
],
343339
linkshared = 1,
344340
deps = [
@@ -417,7 +413,6 @@ cc_binary(
417413
],
418414
copts = [
419415
"-pthread",
420-
"-std=c++11",
421416
],
422417
linkshared = 1,
423418
deps = [
@@ -461,7 +456,6 @@ cc_binary(
461456
],
462457
copts = [
463458
"-pthread",
464-
"-std=c++11",
465459
],
466460
linkshared = 1,
467461
deps = [

third_party/icu/data/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ exports_files(["LICENSE"])
2828
cc_library(
2929
name = "icu_normalization_data",
3030
srcs = ["normalization_data.c"],
31-
copts = ["-std=c++11"],
3231
deps = ["@icu//:headers"],
3332
)

0 commit comments

Comments
 (0)