The maximum subframe count check should not be skipped for empty URLs.
[WebKit-https.git] / Makefile.shared
index 8116ba4..85f0cb7 100644 (file)
@@ -38,6 +38,22 @@ ifneq (,$(SDK_VARIANT))
        XCODE_OPTIONS += SDK_VARIANT="$(SDK_VARIANT)"
 endif
 
+ifeq (, $(findstring WK_USE_CCACHE, $(ARGS)))
+       ifneq (, $(shell which ccache))
+               XCODE_OPTIONS += WK_USE_CCACHE=YES
+       endif
+endif
+
+ifeq ($(findstring UseNewBuildSystem,$(ARGS)),)
+       CAN_USE_XCBUILD = $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print canUseXCBuild()')
+       ifeq ($(CAN_USE_XCBUILD),1)
+               XCODE_OPTIONS += -UseNewBuildSystem=YES
+               XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=YES
+       else
+               XCODE_OPTIONS += -UseNewBuildSystem=NO
+       endif
+endif
+
 DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
 VERBOSITY ?= $(DEFAULT_VERBOSITY)