Revert " [sdks] Add mac-{mac32,mac64} and ios-tools64 targets" (#11734)

* Revert "[wasm][binding] Allow the cleanup of transparent/bridged marshalled objects causing leaks. (#11660)"

This reverts commit 75741eb68d902f244db0769ec783211e35aa5cda.

* Revert "[wasm] Add the declaring types assembly name to the mangled name for instances during dedup (#11724)"

This reverts commit 63fb96c61ab3848ed26c5db74eaf19198386033b.

* Revert "[runtime] Skip sentry upload when tool fails to build (#11726)"

This reverts commit cb690285fb213b901ee692f6b6e83ea610c19860.

* Revert "[sdks] Add mac-{mac32,mac64} and ios-tools64 targets (#10964)"

This reverts commit 6f1537ef5883ce8ddae2548c24fb4e19e5d92148.

6 files changed, 14 insertions, 88 deletions

diff --git a/sdks/Make.config.sample b/sdks/Make.config.sample
index 2c5f9b385df..e158632bd13 100644
--- a/sdks/Make.config.sample
+++ b/sdks/Make.config.sample
@@ -6,9 +6,6 @@
 #Disables building iOS
 #DISABLE_IOS = 1
 
-#Disables building Mac
-#DISABLE_MAC = 1
-
 #Disables build WebAssembly
 #DISABLE_WASM = 1
 
diff --git a/sdks/builds/.gitignore b/sdks/builds/.gitignore
index 9d4c6fb046b..18687a588ed 100644
--- a/sdks/builds/.gitignore
+++ b/sdks/builds/.gitignore
@@ -36,8 +36,6 @@ ios-sim32-*/
 ios-sim64-*/
 ios-simtv-*/
 ios-simwatch-*/
-mac-mac32-*/
-mac-mac64-*/
 wasm-runtime-*/
 wasm-cross-*/
 wasm-cross-win-*/
diff --git a/sdks/builds/Makefile b/sdks/builds/Makefile
index 7e0e1f2e939..2ea12419eab 100644
--- a/sdks/builds/Makefile
+++ b/sdks/builds/Makefile
@@ -13,9 +13,8 @@ NINJA:=$(shell which ninja)
 UNAME=$(shell uname)
 
 ifneq ($(UNAME),Darwin)
-# iOS and Mac requires Xcode to be available, and Xcode is only available on macOS
+# iOS requires Xcode to be available, and Xcode is only available on macOS
 DISABLE_IOS=1
-DISABLE_MAC=1
 endif
 
 include $(TOP)/sdks/versions.mk
@@ -35,7 +34,7 @@ all: package
 configure-mono: $(TOP)/configure
 
 $(TOP)/configure: $(TOP)/configure.ac $(TOP)/autogen.sh
-	cd $(TOP) && PATH=$(EXTRA_PATH):$$PATH NOCONFIGURE=1 ./autogen.sh $(if $(wildcard $(TOP)/../mono-extensions),--enable-extension-module=xamarin)
+	cd $(TOP) && PATH=$(EXTRA_PATH):$$PATH NOCONFIGURE=1 ./autogen.sh
 
 TARGETS=
 
@@ -47,10 +46,6 @@ ifndef DISABLE_IOS
 ios_TARGETS=
 endif
 
-ifndef DISABLE_MAC
-mac_TARGETS=
-endif
-
 ifndef DISABLE_WASM
 wasm_TARGETS=
 endif
@@ -77,11 +72,6 @@ ifndef DISABLE_IOS
 include ios.mk
 endif
 
-## Mac targets
-ifndef DISABLE_MAC
-include mac.mk
-endif
-
 ## Desktop targets
 ## To run host-side tests
 ifndef DISABLE_DESKTOP
@@ -115,10 +105,6 @@ ifndef DISABLE_IOS
 $(eval $(call ArchiveTemplate,ios))
 endif
 
-ifndef DISABLE_MAC
-$(eval $(call ArchiveTemplate,mac))
-endif
-
 ifndef DISABLE_WASM
 $(eval $(call ArchiveTemplate,wasm))
 endif
diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk
index b665cdfce50..0bc2c8b30db 100644
--- a/sdks/builds/ios.mk
+++ b/sdks/builds/ios.mk
@@ -10,7 +10,7 @@
 # Where <target> is: target32, target32s, target64, sim32, sim64, cross32, cross64
 #
 
-ios_PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin
+PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin
 
 ##
 # Device builds
@@ -34,8 +34,8 @@ ios_PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin
 #
 define iOSDeviceTemplate
 
-_ios-$(1)_CC=$$(CCACHE) $$(ios_PLATFORM_BIN)/clang
-_ios-$(1)_CXX=$$(CCACHE) $$(ios_PLATFORM_BIN)/clang++
+_ios-$(1)_CC=$$(CCACHE) $$(PLATFORM_BIN)/clang
+_ios-$(1)_CXX=$$(CCACHE) $$(PLATFORM_BIN)/clang++
 
 _ios-$(1)_AC_VARS= \
 	ac_cv_c_bigendian=no \
@@ -99,8 +99,7 @@ _ios-$(1)_CONFIGURE_FLAGS = \
 	--without-sigaltstack \
 	--disable-cooperative-suspend \
 	--disable-hybrid-suspend \
-	--disable-crash-reporting \
-	$$(if $$(wildcard $$(TOP)/../mono-extensions),--enable-extension-module=xamarin)
+	--disable-crash-reporting
 
 .stamp-ios-$(1)-toolchain:
 	touch $$@
@@ -178,8 +177,8 @@ $(eval $(call iOSDeviceTemplate,targetwatch,armv7k,armv7k))
 #
 define iOSSimulatorTemplate
 
-_ios-$(1)_CC=$$(CCACHE) $$(ios_PLATFORM_BIN)/clang
-_ios-$(1)_CXX=$$(CCACHE) $$(ios_PLATFORM_BIN)/clang++
+_ios-$(1)_CC=$$(CCACHE) $$(PLATFORM_BIN)/clang
+_ios-$(1)_CXX=$$(CCACHE) $$(PLATFORM_BIN)/clang++
 
 _ios-$(1)_AC_VARS= \
 	ac_cv_func_clock_nanosleep=no \
@@ -223,8 +222,9 @@ _ios-$(1)_CONFIGURE_FLAGS= \
 	--without-ikvm-native \
 	--disable-cooperative-suspend \
 	--disable-hybrid-suspend \
-	--disable-crash-reporting \
-	$$(if $$(wildcard $$(TOP)/../mono-extensions),--enable-extension-module=xamarin)
+	--disable-crash-reporting
+
+# _ios-$(1)_CONFIGURE_FLAGS += --enable-extension-module=xamarin
 
 .stamp-ios-$(1)-toolchain:
 	touch $$@
@@ -295,8 +295,8 @@ define iOSCrossTemplate
 
 _ios-$(1)_OFFSETS_DUMPER_ARGS=--gen-ios
 
-_ios-$(1)_CC=$$(CCACHE) $$(ios_PLATFORM_BIN)/clang
-_ios-$(1)_CXX=$$(CCACHE) $$(ios_PLATFORM_BIN)/clang++
+_ios-$(1)_CC=$$(CCACHE) $$(PLATFORM_BIN)/clang
+_ios-$(1)_CXX=$$(CCACHE) $$(PLATFORM_BIN)/clang++
 
 _ios-$(1)_AC_VARS= \
 	ac_cv_func_shm_open_working_with_mmap=no
diff --git a/sdks/builds/mac.mk b/sdks/builds/mac.mk
deleted file mode 100644
index fbd7c254ccd..00000000000
--- a/sdks/builds/mac.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-
-mac_PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin
-
-##
-# Parameters
-#  $(1): target
-define MacTemplate
-
-_mac-$(1)_CC=$$(CCACHE) $$(mac_PLATFORM_BIN)/clang
-_mac-$(1)_CXX=$$(CCACHE) $$(mac_PLATFORM_BIN)/clang++
-
-_mac-$(1)_AC_VARS= \
-	ac_cv_func_fstatat=no \
-	ac_cv_func_readlinkat=no \
-	ac_cv_func_futimens=no \
-	ac_cv_func_utimensat=no
-
-_mac-$(1)_CFLAGS= \
-	-arch $(2)
-
-_mac-$(1)_CXXFLAGS= \
-	-arch $(2)
-
-_mac-$(1)_CPPFLAGS= \
-	-isysroot $(XCODE_DIR)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(MACOS_VERSION).sdk \
-	-mmacosx-version-min=$(MACOS_VERSION_MIN) \
-
-_mac-$(1)_LDFLAGS= \
-	-Wl,-no_weak_imports
-
-_mac-$(1)_CONFIGURE_FLAGS= \
-	--disable-boehm \
-	--disable-btls \
-	--disable-iconv \
-	--disable-mcs-build \
-	--disable-nls \
-	--enable-maintainer-mode \
-	--with-glib=embedded \
-	--with-mcs-docs=no \
-	$$(if $$(wildcard $$(TOP)/../mono-extensions),--enable-extension-module=xamarin --enable-extension-module)
-
-.stamp-mac-$(1)-toolchain:
-	touch $$@
-
-$$(eval $$(call RuntimeTemplate,mac-$(1),$(2)-apple-darwin10))
-
-mac_TARGETS += mac-$(1)-$$(CONFIGURATION)
-
-endef
-
-$(eval $(call MacTemplate,mac32,i386))
-$(eval $(call MacTemplate,mac64,x86_64))
-
-$(eval $(call BclTemplate,mac-bcl,xammac xammac_net_4_5,xammac xammac_net_4_5))
-mac_TARGETS += mac-bcl
diff --git a/sdks/paths.mk b/sdks/paths.mk
index 4f77b1ba390..646264fbc89 100644
--- a/sdks/paths.mk
+++ b/sdks/paths.mk
@@ -1,5 +1,5 @@
 
-ifeq ($(and $(DISABLE_IOS),$(DISABLE_MAC)),)
+ifndef DISABLE_IOS
 
 CheckXcodeDir=$(or $(and $(wildcard $(1))),$(warning Could not find Xcode in "$(1)"))