Building with MinGW compiler dies with gtest errors
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Feb 2013 02:27:39 +0000 (02:27 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Feb 2013 02:27:39 +0000 (02:27 +0000)
https://bugs.webkit.org/show_bug.cgi?id=108470

Patch by Paweł Forysiuk <tuxator@o2.pl> on 2013-02-05
Reviewed by Martin Robinson.

Variable Libraries_libgtest_la_CXXFLAGS blindly assumes that
pthreads will always be enabled. Make using pthreads for gtest
conditional on the build target.

* gtest/GNUmakefile.am: Set Libraries_libgtest_la_CXXFLAGS accordingly to the build target.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@141959 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ChangeLog
Source/ThirdParty/gtest/GNUmakefile.am

index e43e26385ae7ef111f63f4db11690aac504258e4..4f8188560e0fef112bfe02723fda830fcb318ac9 100644 (file)
@@ -1,3 +1,16 @@
+2013-02-05  Paweł Forysiuk  <tuxator@o2.pl>
+
+        Building with MinGW compiler dies with gtest errors
+        https://bugs.webkit.org/show_bug.cgi?id=108470
+
+        Reviewed by Martin Robinson.
+
+        Variable Libraries_libgtest_la_CXXFLAGS blindly assumes that
+        pthreads will always be enabled. Make using pthreads for gtest
+        conditional on the build target.
+
+        * gtest/GNUmakefile.am: Set Libraries_libgtest_la_CXXFLAGS accordingly to the build target.
+
 2013-01-23  Tony Chang  <tony@chromium.org>
 
         Unreviewed, set svn:eol-style to CRLF on Windows .sln files.
index a8b634331b50c8290086d0a604cc25b86c1234d8..1e70168cf25acb4905e0f6096be842bb54356241 100644 (file)
@@ -36,9 +36,13 @@ Libraries_libgtest_la_CPPFLAGS = \
        -I$(srcdir)/Source/ThirdParty/gtest \
        -I$(srcdir)/Source/ThirdParty/gtest/include
 
+if TARGET_WIN32
+Libraries_libgtest_la_CXXFLAGS = -DGTEST_HAS_PTHREAD=0
+else
 Libraries_libgtest_la_CXXFLAGS = -DGTEST_HAS_PTHREAD=1
 Libraries_libgtest_la_LIBADD = \
        -lpthread
+endif
 
 # gtest source files that we don't compile directly.  They are
 # #included by gtest-all.cc.