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:

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

diff --git a/ChangeLog b/ChangeLog
index 927af3fa18f95b00820962ba2247a149a86ae7d5..cf952a18bcb6a4a855bd89ecfc4f50ca9320139f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-04-29  Jake Nielsen  <jacob_nielsen@apple.com>
+
+        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  <mrobinson@igalia.com>
 
         [CMake] [GTK] Organize and clean up unused CMake variables

diff --git a/Source/Makefile b/Source/Makefile
index b8b0bbed20634a8766ea89e76f8abb2bdcb782dd..2cdf3c32868741fa6de13c84d6cd918ef95b9619 100644 (file)
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -1,8 +1,6 @@
 MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit WebKit2
 
-ifneq (,$(findstring iphoneos,$(SDKROOT)))
-       MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2
-else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
+ifeq (,$(findstring macosx,$(SDKROOT)))
        MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2
 endif
 

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4d2693c75995f4948eb58bb54bb0357a3a9501b0..a5f9034e1cf1b9360001a5130b91e106189eda35 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2015-04-29  Jake Nielsen  <jacob_nielsen@apple.com>
+
+        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  <ap@apple.com>
 
         Use-after-free when invalidating WKPageForceRepaint callback

diff --git a/Tools/Makefile b/Tools/Makefile
index 8d8d833c79f27e259e900310dc2a3792beb54814..163a5310fb25cf172e7dd29ffa2f01cbe1351eaf 100644 (file)
--- a/Tools/Makefile
+++ b/Tools/Makefile
@@ -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
 

diff --git a/Tools/WebKitTestRunner/Makefile b/Tools/WebKitTestRunner/Makefile
index 6d4cfc01c7821185c93edd3a83b0bb4400c49833..dbcc2284f00a44ae899167d7d12a621218169459 100644 (file)
--- a/Tools/WebKitTestRunner/Makefile
+++ b/Tools/WebKitTestRunner/Makefile
@@ -5,7 +5,7 @@ BUILD_WEBKITTESTRUNNER = $(shell (( $(OSX_VERSION) >= 6 )) && echo "YES" )
 
 ifeq "$(BUILD_WEBKITTESTRUNNER)" "YES"
 
-ifneq (,$(findstring iphone,$(SDKROOT)))
+ifeq (,$(findstring macosx,$(SDKROOT)))
        ifeq (,$(findstring clean,$(MAKECMDGOALS)))
                OTHER_OPTIONS += -target WebKitTestRunnerApp
        endif