Title: [183583] trunk
- Revision
- 183583
- Author
- [email protected]
- Date
- 2015-04-29 15:41:18 -0700 (Wed, 29 Apr 2015)
Log Message
Failure when building WebKit for appletvsimulator.
https://bugs.webkit.org/show_bug.cgi?id=144356
Reviewed by Alexey Proskuryakov.
Changes Makefile logic to check for "not OS X" rather than "is iOS" to
make TVOS and WatchOS behave correctly.
.:
* Source/Makefile:
Tools:
* Makefile:
* WebKitTestRunner/Makefile:
Modified Paths
Diff
Modified: trunk/ChangeLog (183582 => 183583)
--- trunk/ChangeLog 2015-04-29 22:32:46 UTC (rev 183582)
+++ trunk/ChangeLog 2015-04-29 22:41:18 UTC (rev 183583)
@@ -1,3 +1,15 @@
+2015-04-29 Jake Nielsen <[email protected]>
+
+ Failure when building WebKit for appletvsimulator.
+ https://bugs.webkit.org/show_bug.cgi?id=144356
+
+ Reviewed by Alexey Proskuryakov.
+
+ Changes Makefile logic to check for "not OS X" rather than "is iOS" to
+ make TVOS and WatchOS behave correctly.
+
+ * Source/Makefile:
+
2015-04-29 Martin Robinson <[email protected]>
[CMake] [GTK] Organize and clean up unused CMake variables
Modified: trunk/Source/Makefile (183582 => 183583)
--- trunk/Source/Makefile 2015-04-29 22:32:46 UTC (rev 183582)
+++ trunk/Source/Makefile 2015-04-29 22:41:18 UTC (rev 183583)
@@ -1,9 +1,7 @@
MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE WebCore WebInspectorUI WebKit WebKit2
-ifneq (,$(findstring iphoneos,$(SDKROOT)))
+ifeq (,$(findstring macosx,$(SDKROOT)))
MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE WebCore WebKit WebKit2
-else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
- MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE WebCore WebKit WebKit2
endif
all:
Modified: trunk/Tools/ChangeLog (183582 => 183583)
--- trunk/Tools/ChangeLog 2015-04-29 22:32:46 UTC (rev 183582)
+++ trunk/Tools/ChangeLog 2015-04-29 22:41:18 UTC (rev 183583)
@@ -1,3 +1,16 @@
+2015-04-29 Jake Nielsen <[email protected]>
+
+ Failure when building WebKit for appletvsimulator.
+ https://bugs.webkit.org/show_bug.cgi?id=144356
+
+ Reviewed by Alexey Proskuryakov.
+
+ Changes Makefile logic to check for "not OS X" rather than "is iOS" to
+ make TVOS and WatchOS behave correctly.
+
+ * Makefile:
+ * WebKitTestRunner/Makefile:
+
2015-04-29 Alexey Proskuryakov <[email protected]>
Use-after-free when invalidating WKPageForceRepaint callback
Modified: trunk/Tools/Makefile (183582 => 183583)
--- trunk/Tools/Makefile 2015-04-29 22:32:46 UTC (rev 183582)
+++ trunk/Tools/Makefile 2015-04-29 22:41:18 UTC (rev 183583)
@@ -1,6 +1,6 @@
MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
-ifneq (,$(findstring iphone,$(SDKROOT)))
+ifeq (,$(findstring macosx,$(SDKROOT)))
MODULES = DumpRenderTree WebKitTestRunner ../Source/ThirdParty/gtest/xcode TestWebKitAPI
endif
Modified: trunk/Tools/WebKitTestRunner/Makefile (183582 => 183583)
--- trunk/Tools/WebKitTestRunner/Makefile 2015-04-29 22:32:46 UTC (rev 183582)
+++ trunk/Tools/WebKitTestRunner/Makefile 2015-04-29 22:41:18 UTC (rev 183583)
@@ -5,7 +5,7 @@
ifeq "$(BUILD_WEBKITTESTRUNNER)" "YES"
-ifneq (,$(findstring iphone,$(SDKROOT)))
+ifeq (,$(findstring macosx,$(SDKROOT)))
ifeq (,$(findstring clean,$(MAKECMDGOALS)))
OTHER_OPTIONS += -target WebKitTestRunnerApp
endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
