Title: [141959] trunk/Source/ThirdParty
- Revision
- 141959
- Author
- [email protected]
- Date
- 2013-02-05 18:27:39 -0800 (Tue, 05 Feb 2013)
Log Message
Building with MinGW compiler dies with gtest errors
https://bugs.webkit.org/show_bug.cgi?id=108470
Patch by Paweł Forysiuk <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ChangeLog (141958 => 141959)
--- trunk/Source/ThirdParty/ChangeLog 2013-02-06 02:21:28 UTC (rev 141958)
+++ trunk/Source/ThirdParty/ChangeLog 2013-02-06 02:27:39 UTC (rev 141959)
@@ -1,3 +1,16 @@
+2013-02-05 Paweł Forysiuk <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, set svn:eol-style to CRLF on Windows .sln files.
Modified: trunk/Source/ThirdParty/gtest/GNUmakefile.am (141958 => 141959)
--- trunk/Source/ThirdParty/gtest/GNUmakefile.am 2013-02-06 02:21:28 UTC (rev 141958)
+++ trunk/Source/ThirdParty/gtest/GNUmakefile.am 2013-02-06 02:27:39 UTC (rev 141959)
@@ -36,9 +36,13 @@
-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.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
