From b097f7bbabe4dcdfb91020a1887f2559e1765eca Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Wed, 26 Aug 2020 07:59:46 +0200 Subject: [PATCH] [tools] Honor the ENABLE_DOTNET variable. Fixes #9475. (#9502) Fixes https://github.com/xamarin/xamarin-macios/issues/9475. --- tools/Makefile | 8 ++++++-- tools/mmp/Makefile | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 457de1e8a00f..245271857797 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,8 +1,12 @@ TOP=.. -SUBDIRS=mmp mtouch xibuild mlaunch siminstaller dotnet-linker +SUBDIRS=mmp mtouch xibuild mlaunch siminstaller include $(TOP)/Make.config ifdef ENABLE_INSTALL_SOURCE SUBDIRS += install-source -endif \ No newline at end of file +endif + +ifdef ENABLE_DOTNET +SUBDIRS += dotnet-linker +endif diff --git a/tools/mmp/Makefile b/tools/mmp/Makefile index 6283acefc85a..1ebd65d975bd 100644 --- a/tools/mmp/Makefile +++ b/tools/mmp/Makefile @@ -26,7 +26,6 @@ MMP_TARGETS = \ $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mmp/mmp.exe \ $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mmp/Xamarin.Mac.registrar.mobile.a \ $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mmp/Xamarin.Mac.registrar.full.a \ - $(MMP_TARGETS_DOTNET) \ MMP_DIRECTORIES_DOTNET = \ $(DOTNET_DESTDIR)/Microsoft.macOS.Runtime.osx-x64/runtimes/osx-x64/native \