Title: [192106] trunk
- Revision
- 192106
- Author
- [email protected]
- Date
- 2015-11-06 08:58:31 -0800 (Fri, 06 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.
.:
Add support for overriding the user-provided arguments SDKROOT and ARCHS
on a per Makefile basis.
* Makefile.shared:
Tools:
Override the user-specified arguments SDKROOT and ARCHS to use the default SDK
and default ARCHS since LayoutTestRelay is a Mac command line tool.
* LayoutTestRelay/Makefile: Define OVERWRITE_SDKROOT and OVERWRITE_ARCHS.
Modified Paths
Diff
Modified: trunk/ChangeLog (192105 => 192106)
--- trunk/ChangeLog 2015-11-06 16:47:45 UTC (rev 192105)
+++ trunk/ChangeLog 2015-11-06 16:58:31 UTC (rev 192106)
@@ -1,3 +1,15 @@
+2015-11-06 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.
+
+ Add support for overriding the user-provided arguments SDKROOT and ARCHS
+ on a per Makefile basis.
+
+ * Makefile.shared:
+
2015-11-06 Philippe Normand <[email protected]>
Unreviewed, GTK build fix after r192095.
Modified: trunk/Makefile.shared (192105 => 192106)
--- trunk/Makefile.shared 2015-11-06 16:47:45 UTC (rev 192105)
+++ trunk/Makefile.shared 2015-11-06 16:58:31 UTC (rev 192106)
@@ -4,12 +4,27 @@
XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS)
ifneq (,$(SDKROOT))
- XCODE_OPTIONS += SDKROOT=$(SDKROOT)
+ ifneq (,$(OVERRIDE_SDKROOT))
+ ifneq (default,$(OVERRIDE_SDKROOT))
+ XCODE_OPTIONS := $(XCODE_OPTIONS) SDKROOT=$(OVERRIDE_SDKROOT)
+ endif
+ OVERRIDE_SDKROOT =
+ else
+ XCODE_OPTIONS := $(XCODE_OPTIONS) SDKROOT=$(SDKROOT)
+ endif
endif
ifneq (,$(ARCHS))
- XCODE_OPTIONS += ARCHS="$(ARCHS)"
- XCODE_OPTIONS += _ONLY_ACTIVE_ARCH_=NO
+ ifneq (,$(OVERRIDE_ARCHS))
+ ifneq (default,$(OVERRIDE_ARCHS))
+ XCODE_OPTIONS := $(XCODE_OPTIONS) ARCHS="$(OVERRIDE_ARCHS)"
+ XCODE_OPTIONS += _ONLY_ACTIVE_ARCH_=NO
+ endif
+ OVERRIDE_ARCHS =
+ else
+ XCODE_OPTIONS := $(XCODE_OPTIONS) ARCHS="$(ARCHS)"
+ XCODE_OPTIONS += _ONLY_ACTIVE_ARCH_=NO
+ endif
endif
DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
Modified: trunk/Tools/ChangeLog (192105 => 192106)
--- trunk/Tools/ChangeLog 2015-11-06 16:47:45 UTC (rev 192105)
+++ trunk/Tools/ChangeLog 2015-11-06 16:58:31 UTC (rev 192106)
@@ -1,3 +1,15 @@
+2015-11-06 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.
+
+ Override the user-specified arguments SDKROOT and ARCHS to use the default SDK
+ and default ARCHS since LayoutTestRelay is a Mac command line tool.
+
+ * LayoutTestRelay/Makefile: Define OVERWRITE_SDKROOT and OVERWRITE_ARCHS.
+
2015-11-05 Nikos Andronikos <[email protected]>
Add runtime and compile time flags for enabling Web Animations API and model.
Modified: trunk/Tools/LayoutTestRelay/Makefile (192105 => 192106)
--- trunk/Tools/LayoutTestRelay/Makefile 2015-11-06 16:47:45 UTC (rev 192105)
+++ trunk/Tools/LayoutTestRelay/Makefile 2015-11-06 16:58:31 UTC (rev 192106)
@@ -1,3 +1,6 @@
SCRIPTS_PATH = ../Scripts
+OVERRIDE_ARCHS = default
+OVERRIDE_SDKROOT = default
+
include ../../Makefile.shared
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
