Title: [192073] trunk/Tools
- Revision
- 192073
- Author
- [email protected]
- Date
- 2015-11-05 14:00:16 -0800 (Thu, 05 Nov 2015)
Log Message
Teach Makefile to build LayoutTestRelay when building for iOS Simulator
https://bugs.webkit.org/show_bug.cgi?id=150849
Reviewed by Alexey Proskuryakov.
* LayoutTestRelay/Makefile: Temporarily override SDKROOT when it is iphonesimulator so
that we build with the default SDK. We assume that the default SDK is the OS X SDK.
* Makefile: Append LayoutTestRelay to the list of modules to build when building with
SDK iphonesimulator.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (192072 => 192073)
--- trunk/Tools/ChangeLog 2015-11-05 21:51:05 UTC (rev 192072)
+++ trunk/Tools/ChangeLog 2015-11-05 22:00:16 UTC (rev 192073)
@@ -1,3 +1,15 @@
+2015-11-05 Daniel Bates <[email protected]>
+
+ Teach Makefile to build LayoutTestRelay when building for iOS Simulator
+ https://bugs.webkit.org/show_bug.cgi?id=150849
+
+ Reviewed by Alexey Proskuryakov.
+
+ * LayoutTestRelay/Makefile: Temporarily override SDKROOT when it is iphonesimulator so
+ that we build with the default SDK. We assume that the default SDK is the OS X SDK.
+ * Makefile: Append LayoutTestRelay to the list of modules to build when building with
+ SDK iphonesimulator.
+
2015-11-05 Ryuan Choi <[email protected]>
[EFL] Add try_close API to handle beforeunload event
Modified: trunk/Tools/LayoutTestRelay/Makefile (192072 => 192073)
--- trunk/Tools/LayoutTestRelay/Makefile 2015-11-05 21:51:05 UTC (rev 192072)
+++ trunk/Tools/LayoutTestRelay/Makefile 2015-11-05 22:00:16 UTC (rev 192073)
@@ -1,3 +1,15 @@
SCRIPTS_PATH = ../Scripts
+ifneq (,$(SDKROOT))
+ ifeq ($(findstring iphonesimulator,$(SDKROOT)),iphonesimulator)
+ SAVED_SDK_ROOT = $(SDKROOT)
+ override SDKROOT =
+ endif
+endif
+
include ../../Makefile.shared
+
+ifneq (,$(SAVED_SDK_ROOT))
+ override SDKROOT = $(SAVED_SDK_ROOT)
+ undefine SAVED_SDK_ROOT
+endif
Modified: trunk/Tools/Makefile (192072 => 192073)
--- trunk/Tools/Makefile 2015-11-05 21:51:05 UTC (rev 192072)
+++ trunk/Tools/Makefile 2015-11-05 22:00:16 UTC (rev 192073)
@@ -4,6 +4,9 @@
ifeq (,$(findstring macosx,$(SDKROOT)))
MODULES = DumpRenderTree WebKitTestRunner ../Source/ThirdParty/gtest/xcode TestWebKitAPI
endif
+ ifeq ($(findstring iphonesimulator,$(SDKROOT)),iphonesimulator)
+ MODULES += LayoutTestRelay
+ endif
endif
all:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
