Merge pull request #57 from darinpp/crl-release-6.2.1

Disable TLS for MINGW due to issues with the order of freeing up memory.
cockroachdb · Sep 23, 2019 · 8978e86 · 8978e86
2 parents afdceb8 + bdf59ac
commit 8978e86
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -243,6 +243,7 @@ elseif(FORCE_SSE42)
   message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled")
 endif()
 
+if(NOT MINGW)
 CHECK_CXX_SOURCE_COMPILES("
 #if defined(_MSC_VER) && !defined(__thread)
 #define __thread __declspec(thread)
@@ -254,6 +255,7 @@ int main() {
 if(HAVE_THREAD_LOCAL)
   add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
 endif()
+endif()
 
 option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
 if(FAIL_ON_WARNINGS)