diff --git a/makefiles/legacy.mk b/makefiles/legacy.mk
index c5da511bf1..18d3a4335c 100644
--- a/makefiles/legacy.mk
+++ b/makefiles/legacy.mk
@@ -44,7 +44,7 @@ FW_PACKAGE_NAME = $(THEOS_PACKAGE_NAME)$(warning FW_PACKAGE_NAME is deprecated.
 FW_PACKAGE_ARCH = $(THEOS_PACKAGE_ARCH)$(warning FW_PACKAGE_ARCH is deprecated. Please migrate to THEOS_PACKAGE_ARCH.)
 FW_PACKAGE_VERSION = $(THEOS_PACKAGE_BASE_VERSION)$(warning FW_PACKAGE_VERSION is deprecated. Please migrate to THEOS_PACKAGE_BASE_VERSION.)
 FW_PACKAGE_DEBVERSION = $(call __simplify,FW_PACKAGE_DEBVERSION,$(THEOS_PACKAGE_BASE_VERSION))$(warning FW_PACKAGE_DEBVERSION is deprecated. Please migrate to THEOS_PACKAGE_BASE_VERSION.)
-FW_PACKAGE_FILENAME = $(THEOS_PACKAGE_FILENAME)$(warning FW_PACKAGE_FILENAME is deprecated. Please migrate to THEOS_PACKAGE_FILENAME.)
+FW_PACKAGE_FILENAME = $(error FW_PACKAGE_FILENAME is deprecated. The filename for the most recent package can be found in '.theos/last_package'.)
 FW_PACKAGE_STAGING_DIR = $(THEOS_STAGING_DIR)$(warning FW_PACKAGE_STAGING_DIR is deprecated. Please migrate to THEOS_STAGING_DIR.)
 
 ifdef FW_DEVICE_TUNNEL
diff --git a/makefiles/targets/Windows/iphone.mk b/makefiles/targets/Windows/iphone.mk
index 5a608672f0..12ed9ab700 100755
--- a/makefiles/targets/Windows/iphone.mk
+++ b/makefiles/targets/Windows/iphone.mk
@@ -7,20 +7,25 @@ _THEOS_TARGET_PLATFORM_SDK_NAME := iPhoneOS
 _THEOS_TARGET_PLATFORM_FLAG_NAME := iphoneos
 _THEOS_TARGET_PLATFORM_SWIFT_NAME := apple-ios
 
+SWIFTBINPATH ?= $(THEOS)/toolchain/swift/bin
+SDKBINPATH ?= $(THEOS)/toolchain/$(THEOS_PLATFORM_NAME)/$(THEOS_TARGET_NAME)/bin
+
 # Determine toolchain to use based on file existence.
-ifeq ($(SDKTARGET),)
-ifeq ($(call __exists,$(THEOS)/toolchain/$(THEOS_PLATFORM_NAME)/$(THEOS_TARGET_NAME)/bin/arm64-apple-darwin14-ld),$(_THEOS_TRUE))
-SDKTARGET ?= arm64-apple-darwin14
+ifeq ($(_THEOS_TARGET_SDK_BIN_PREFIX),)
+ifeq ($(call __exists,$(SDKBINPATH)/armv7-apple-darwin11-ld),$(_THEOS_TRUE))
+_THEOS_TARGET_SDK_BIN_PREFIX ?= armv7-apple-darwin11-
+else ifeq ($(call __exists,$(SDKBINPATH)/arm64-apple-darwin14-ld),$(_THEOS_TRUE))
+_THEOS_TARGET_SDK_BIN_PREFIX ?= arm64-apple-darwin14-
 else
-SDKTARGET ?= armv7-apple-darwin11
+# toolchain has no prefix so we are responsible of supplying target triple to clang for cross compiling
+_THEOS_TARGET_USE_CLANG_TARGET_FLAG := $(_THEOS_TRUE)
 endif
 endif
 
-SWIFTBINPATH ?= $(THEOS)/toolchain/swift/bin
-SDKBINPATH ?= $(THEOS)/toolchain/$(THEOS_PLATFORM_NAME)/$(THEOS_TARGET_NAME)/bin
-PREFIX := $(SDKBINPATH)/$(SDKTARGET)-
+PREFIX := $(SDKBINPATH)/$(_THEOS_TARGET_SDK_BIN_PREFIX)
 
 include $(THEOS_MAKE_PATH)/targets/_common/darwin_head.mk
 include $(THEOS_MAKE_PATH)/targets/_common/iphone.mk
 include $(THEOS_MAKE_PATH)/targets/_common/darwin_tail.mk
+
 endif
diff --git a/makefiles/targets/_common/cygwin.mk b/makefiles/targets/_common/cygwin.mk
index ecaf12d333..37b717783b 100755
--- a/makefiles/targets/_common/cygwin.mk
+++ b/makefiles/targets/_common/cygwin.mk
@@ -1,4 +1,4 @@
-# Variables that are common to all Linux-based targets.
+# Variables that are common to all Windows-based targets.
 TARGET_EXE_EXT := .exe
 TARGET_LIB_EXT := .dll
 TARGET_AR_EXT := .a