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.

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

diff --git a/ChangeLog b/ChangeLog
index 291ba6dc40ca5176cec62b8fb205e5b688098830..90018ef44d271d6401af394d92003ddb47fe7964 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-11-06  Daniel Bates  <dabates@apple.com>
+
+        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  <pnormand@igalia.com>
 
         Unreviewed, GTK build fix after r192095.

diff --git a/Makefile.shared b/Makefile.shared
index a5cb210833744dc984a0ea38b2a147581326ef38..5dae8182837ab0d6f50557a39a10076bf969c1d8 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -4,12 +4,27 @@ SET_COLOR_DIAGNOSTICS_ARG = if [[ -t 1 ]]; then COLOR_DIAGNOSTICS_ARG="COLOR_DIA
 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")

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 98c33ab037469c29968b955269fd5173980c4f57..bac3196033b4431964078ea5820c2ebe8a6feca7 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2015-11-06  Daniel Bates  <dabates@apple.com>
+
+        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  <nikos.andronikos-webkit@cisra.canon.com.au>
 
         Add runtime and compile time flags for enabling Web Animations API and model.

diff --git a/Tools/LayoutTestRelay/Makefile b/Tools/LayoutTestRelay/Makefile
index e489fc4bf8910c0bcac9a052a025850350386e1b..fd9d0b686f8f152dea225924a06c81555e8648ec 100644 (file)
--- a/Tools/LayoutTestRelay/Makefile
+++ b/Tools/LayoutTestRelay/Makefile
@@ -1,3 +1,6 @@
 SCRIPTS_PATH = ../Scripts
 
+OVERRIDE_ARCHS = default
+OVERRIDE_SDKROOT = default
+
 include ../../Makefile.shared