From f1b7f3969bd2a44d39eb7fb9161f46fd15af8966 Mon Sep 17 00:00:00 2001
From: Ludovic Henry <luhenry@microsoft.com>
Date: Mon, 19 Nov 2018 08:52:19 -0500
Subject: 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.
---
 sdks/builds/Makefile | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'sdks/builds/Makefile')

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
-- 
cgit v1.2.3