Unreviewed, rolling out r219453.

[WebKit-https.git] / Makefile.shared

diff --git a/Makefile.shared b/Makefile.shared
index a5cb210..b318440 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -4,19 +4,42 @@ 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
+               # Make Plugin.32 and Plugin.64 build even when they can't be built for the specified architecture.
+               ifeq ($(ARCHS),i386)
+                       XCODE_OPTIONS += VALID_ARCHS=i386
+               endif
+               ifeq ($(ARCHS),x86_64)
+                       XCODE_OPTIONS += VALID_ARCHS=x86_64
+               endif
+       endif
 endif
 
 DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
 VERBOSITY ?= $(DEFAULT_VERBOSITY)
 
 ifeq ($(VERBOSITY),default)
-OUTPUT_FILTER = grep -v setenv
+OUTPUT_FILTER = cat
+XCODE_OPTIONS += -hideShellScriptEnvironment
 else
 ifeq ($(VERBOSITY),noisy)
 OUTPUT_FILTER = cat