aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorKeith Smiley <keithbsmiley@gmail.com>2022-08-19 11:10:56 -0700
committerKeith Smiley <keithbsmiley@gmail.com>2022-08-19 11:11:26 -0700
commit91c3669f21cf569f13bd15569b5411e6ca9a8961 (patch)
treec8aab291348ab5753fbc7ffb701d0ff419fd6623 /ci
parentc0e032efe587efa99413dd9ac54c3953a7915588 (diff)
downloadgoogletest-91c3669f21cf569f13bd15569b5411e6ca9a8961.zip
googletest-91c3669f21cf569f13bd15569b5411e6ca9a8961.tar.gz
googletest-91c3669f21cf569f13bd15569b5411e6ca9a8961.tar.bz2
bazel: move -std=c++14 to .bazelrc
Bazel defaults to -std=c++11 on macOS which gtest doesn't support.
Diffstat (limited to 'ci')
-rw-r--r--ci/linux-presubmit.sh1
-rw-r--r--ci/macos-presubmit.sh1
2 files changed, 0 insertions, 2 deletions
diff --git a/ci/linux-presubmit.sh b/ci/linux-presubmit.sh
index 4eb5bbe..f6eb9b7 100644
--- a/ci/linux-presubmit.sh
+++ b/ci/linux-presubmit.sh
@@ -72,7 +72,6 @@ time docker run \
--workdir="/src" \
--rm \
--env="CC=/usr/local/bin/gcc" \
- --env="BAZEL_CXXOPTS=-std=c++14" \
${LINUX_GCC_FLOOR_CONTAINER} \
/usr/local/bin/bazel test ... \
--copt="-Wall" \
diff --git a/ci/macos-presubmit.sh b/ci/macos-presubmit.sh
index 8f35df5..a5d6635 100644
--- a/ci/macos-presubmit.sh
+++ b/ci/macos-presubmit.sh
@@ -66,7 +66,6 @@ for absl in 0 1; do
${BAZEL_BIN} test ... \
--copt="-Wall" \
--copt="-Werror" \
- --cxxopt="-std=c++14" \
--define="absl=${absl}" \
--features=external_include_paths \
--keep_going \