From 94bbf01b52e16a27dc51f549afe1f8f893331cbf Mon Sep 17 00:00:00 2001
From: David Neto <dneto@google.com>
Date: Wed, 9 Aug 2023 12:23:52 -0400
Subject: [PATCH] Remove redundant gtest compile flags for MinGW

When compiling with MinGW, we no longer need to use
-Dgtest_disable_pthreads=ON.

See https://github.com/google/googletest/pull/856
and https://github.com/google/googletest/pull/721
---
 README.md                    | 5 +----
 kokoro/linux/build-docker.sh | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b2907f0e1..3f54dedd0 100644
--- a/README.md
+++ b/README.md
@@ -140,14 +140,11 @@ ctest -C {Release|Debug|MinSizeRel|RelWithDebInfo}
 ```
 
 4c) Or build with MinGW on Linux for Windows:
-(Skip building threaded unit tests due to
-[Googletest bug 606](https://github.com/google/googletest/issues/606))
 
 ```sh
 cd $BUILD_DIR
 cmake -GNinja -DCMAKE_BUILD_TYPE={Debug|Release|RelWithDebInfo} $SOURCE_DIR \
-   -DCMAKE_TOOLCHAIN_FILE=$SOURCE_DIR/cmake/linux-mingw-toolchain.cmake \
-   -Dgtest_disable_pthreads=ON
+   -DCMAKE_TOOLCHAIN_FILE=$SOURCE_DIR/cmake/linux-mingw-toolchain.cmake
 ninja
 ```
 
diff --git a/kokoro/linux/build-docker.sh b/kokoro/linux/build-docker.sh
index 003c86e52..7d71b6123 100755
--- a/kokoro/linux/build-docker.sh
+++ b/kokoro/linux/build-docker.sh
@@ -53,7 +53,7 @@ then
   ADDITIONAL_CMAKE_FLAGS="-DDISABLE_EXCEPTIONS=ON -DDISABLE_RTTI=ON"
 elif [ $CONFIG = "RELEASE_MINGW" ]
 then
-  ADDITIONAL_CMAKE_FLAGS="-Dgtest_disable_pthreads=ON -DCMAKE_TOOLCHAIN_FILE=$ROOT_DIR/cmake/linux-mingw-toolchain.cmake"
+  ADDITIONAL_CMAKE_FLAGS="-DCMAKE_TOOLCHAIN_FILE=$ROOT_DIR/cmake/linux-mingw-toolchain.cmake"
   SKIP_TESTS="True"
 fi