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
+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.
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")
+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.
SCRIPTS_PATH = ../Scripts
+OVERRIDE_ARCHS = default
+OVERRIDE_SDKROOT = default
+
include ../../Makefile.shared