From 91c3669f21cf569f13bd15569b5411e6ca9a8961 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Fri, 19 Aug 2022 11:10:56 -0700
Subject: [PATCH] bazel: move -std=c++14 to .bazelrc

Bazel defaults to -std=c++11 on macOS which gtest doesn't support.
---
 .bazelrc                       | 1 +
 .github/workflows/gtest-ci.yml | 9 +++------
 ci/linux-presubmit.sh          | 1 -
 ci/macos-presubmit.sh          | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 .bazelrc

diff --git a/.bazelrc b/.bazelrc
new file mode 100644
index 00000000..f93facf0
--- /dev/null
+++ b/.bazelrc
@@ -0,0 +1 @@
+build --cxxopt=-std=c++14
diff --git a/.github/workflows/gtest-ci.yml b/.github/workflows/gtest-ci.yml
index b2dcab49..e61880f9 100644
--- a/.github/workflows/gtest-ci.yml
+++ b/.github/workflows/gtest-ci.yml
@@ -4,9 +4,6 @@ on:
   push:
   pull_request:
 
-env:
-  BAZEL_CXXOPTS: -std=c++14
-
 jobs:
   Linux:
     runs-on: ubuntu-latest
@@ -17,7 +14,7 @@ jobs:
         fetch-depth: 0
 
     - name: Tests
-      run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ...
+      run: bazel test --features=external_include_paths --test_output=errors ...
 
   MacOs:
     runs-on: macos-latest
@@ -28,7 +25,7 @@ jobs:
         fetch-depth: 0
 
     - name: Tests
-      run:  bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ...
+      run:  bazel test --features=external_include_paths --test_output=errors ...
 
 
   Windows:
@@ -40,4 +37,4 @@ jobs:
         fetch-depth: 0
 
     - name: Tests
-      run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ...
+      run: bazel test --features=external_include_paths --test_output=errors ...
diff --git a/ci/linux-presubmit.sh b/ci/linux-presubmit.sh
index 4eb5bbe4..f6eb9b7d 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 8f35df58..a5d6635a 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 \