[sdks] Merge mxe-Win32 and mxe-Win64 targets since we are building both in XA anyway

5 files changed, 55 insertions, 70 deletions

diff --git a/sdks/builds/.gitignore b/sdks/builds/.gitignore
index 3ec05f033c9..4a8f77947bd 100644
--- a/sdks/builds/.gitignore
+++ b/sdks/builds/.gitignore
@@ -2,8 +2,7 @@
 .stamp-*
 *.mk.generated
 *.config.cache
-mxe-Win32/
-mxe-Win64/
+mxe/
 llvm-llvm32/
 llvm-llvm64/
 llvm-llvmwin32/
diff --git a/sdks/builds/Makefile b/sdks/builds/Makefile
index b3bd7fdad95..aba23647eb1 100644
--- a/sdks/builds/Makefile
+++ b/sdks/builds/Makefile
@@ -12,11 +12,6 @@ ifeq (, $(shell which glibtoolize))
 EXTRA_PATH=$(wildcard /usr/local/Cellar/libtool/*/bin/)
 endif
 
-# Some of the targets cannot be built in parallel (ex: mxe). This is a gross hack, but fixing it would mean a unknown
-# amount of change. For example, we could invoke the MXE targets with `$(MAKE) -f mxe.mk build-mxe-Win32` and move the
-# .NOTPARALLEL there.
-.NOTPARALLEL:
-
 all: package
 
 ## Common Mono targets
diff --git a/sdks/builds/android.mk b/sdks/builds/android.mk
index d69d39ebe26..b989d18d6d5 100644
--- a/sdks/builds/android.mk
+++ b/sdks/builds/android.mk
@@ -250,20 +250,19 @@ $(eval $(call AndroidHostTemplate,host-Linux))
 # Parameters
 #  $(1): target
 #  $(2): arch
-#  $(3): mxe
 define AndroidHostMxeTemplate
 
-_android_$(1)_PATH=$$(TOP)/sdks/out/mxe-$(3)/bin
+_android_$(1)_PATH=$$(TOP)/sdks/out/mxe/bin
 
-_android_$(1)_AR=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-ar
-_android_$(1)_AS=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-as
-_android_$(1)_CC=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-gcc
-_android_$(1)_CXX=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-g++
-_android_$(1)_DLLTOOL=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-dlltool
-_android_$(1)_LD=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-ld
-_android_$(1)_OBJDUMP=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-objdump
-_android_$(1)_RANLIB=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-ranlib
-_android_$(1)_STRIP=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-strip
+_android_$(1)_AR=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-ar
+_android_$(1)_AS=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-as
+_android_$(1)_CC=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-gcc
+_android_$(1)_CXX=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-g++
+_android_$(1)_DLLTOOL=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-dlltool
+_android_$(1)_LD=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-ld
+_android_$(1)_OBJDUMP=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-objdump
+_android_$(1)_RANLIB=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-ranlib
+_android_$(1)_STRIP=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-strip
 
 _android_$(1)_AC_VARS= \
 	ac_cv_header_zlib_h=no \
@@ -303,7 +302,7 @@ _android_$(1)_CONFIGURE_FLAGS= \
 .stamp-android-$(1)-toolchain:
 	touch $$@
 
-.stamp-android-$(1)-$$(CONFIGURATION)-configure: $$(TOP)/configure .stamp-android-$(1)-toolchain | package-mxe-$(3)
+.stamp-android-$(1)-$$(CONFIGURATION)-configure: $$(TOP)/configure .stamp-android-$(1)-toolchain | package-mxe
 	mkdir -p $$(TOP)/sdks/builds/android-$(1)-$$(CONFIGURATION)
 	cd $$(TOP)/sdks/builds/android-$(1)-$$(CONFIGURATION) && PATH="$$$$PATH:$$(_android_$(1)_PATH)" $$< $$(_android_$(1)_AC_VARS) $$(_android_$(1)_CONFIGURE_ENVIRONMENT) $$(_android_$(1)_CONFIGURE_FLAGS)
 	touch $$@
@@ -340,5 +339,5 @@ TARGETS += android-$(1)
 
 endef
 
-$(eval $(call AndroidHostMxeTemplate,host-mxe-Win32,i686,Win32))
-$(eval $(call AndroidHostMxeTemplate,host-mxe-Win64,x86_64,Win64))
+$(eval $(call AndroidHostMxeTemplate,host-mxe-Win32,i686))
+$(eval $(call AndroidHostMxeTemplate,host-mxe-Win64,x86_64))
diff --git a/sdks/builds/llvm.mk b/sdks/builds/llvm.mk
index d14d5c6ca8b..b1067be53cb 100644
--- a/sdks/builds/llvm.mk
+++ b/sdks/builds/llvm.mk
@@ -57,23 +57,22 @@ $(eval $(call LLVMTemplate,llvm64,x86_64))
 # Parameters
 #  $(1): target
 #  $(2): arch
-#  $(3): mxe
 #
 # Flags
 #  llvm_$(1)_CONFIGURE_ENVIRONMENT
 define LLVMMxeTemplate
 
-_llvm_$(1)_PATH=$$(TOP)/sdks/out/mxe-$(3)/bin
+_llvm_$(1)_PATH=$$(TOP)/sdks/out/mxe/bin
 
-_llvm_$(1)_AR=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-ar
-_llvm_$(1)_AS=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-as
-_llvm_$(1)_CC=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-gcc
-_llvm_$(1)_CXX=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-g++
-_llvm_$(1)_DLLTOOL=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-dlltool
-_llvm_$(1)_LD=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-ld
-_llvm_$(1)_OBJDUMP=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-objdump
-_llvm_$(1)_RANLIB=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-ranlib
-_llvm_$(1)_STRIP=$$(TOP)/sdks/out/mxe-$(3)/bin/$(2)-w64-mingw32.static-strip
+_llvm_$(1)_AR=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-ar
+_llvm_$(1)_AS=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-as
+_llvm_$(1)_CC=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-gcc
+_llvm_$(1)_CXX=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-g++
+_llvm_$(1)_DLLTOOL=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-dlltool
+_llvm_$(1)_LD=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-ld
+_llvm_$(1)_OBJDUMP=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-objdump
+_llvm_$(1)_RANLIB=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-ranlib
+_llvm_$(1)_STRIP=$$(TOP)/sdks/out/mxe/bin/$(2)-w64-mingw32.static-strip
 
 _llvm_$(1)_CXXFLAGS=
 
@@ -106,7 +105,7 @@ _llvm_$(1)_CONFIGURE_FLAGS = \
 	cd $$(TOP)/sdks/builds/toolchains/llvm && git checkout $(LLVM_HASH)
 	touch $$@
 
-.stamp-llvm-$(1)-configure: $$(TOP)/sdks/builds/toolchains/llvm/configure | package-mxe-$(3)
+.stamp-llvm-$(1)-configure: $$(TOP)/sdks/builds/toolchains/llvm/configure | package-mxe
 	mkdir -p $$(TOP)/sdks/builds/llvm-$(1)
 	cd $$(TOP)/sdks/builds/llvm-$(1) && PATH="$$$$PATH:$$(_llvm_$(1)_PATH)" $$< $$(_llvm_$(1)_CONFIGURE_ENVIRONMENT) $$(_llvm_$(1)_CONFIGURE_FLAGS)
 	touch $$@
@@ -123,5 +122,5 @@ TARGETS += llvm-$(1)
 
 endef
 
-$(eval $(call LLVMMxeTemplate,llvmwin32,i686,Win32))
-$(eval $(call LLVMMxeTemplate,llvmwin64,x86_64,Win64))
\ No newline at end of file
+$(eval $(call LLVMMxeTemplate,llvmwin32,i686))
+$(eval $(call LLVMMxeTemplate,llvmwin64,x86_64))
diff --git a/sdks/builds/mxe.mk b/sdks/builds/mxe.mk
index 21cb0be3693..aed13204bcc 100644
--- a/sdks/builds/mxe.mk
+++ b/sdks/builds/mxe.mk
@@ -2,38 +2,31 @@
 $(TOP)/sdks/builds/toolchains/mxe:
 	git clone -b xamarin https://github.com/xamarin/mxe.git $@
 
-##
-# Parameters
-#  $(1): target
-#  $(2): arch
-define MxeTemplate
-
-.stamp-mxe-$(1)-toolchain: | $$(TOP)/sdks/builds/toolchains/mxe
-	cd $$(TOP)/sdks/builds/toolchains/mxe && git checkout $$(MXE_HASH)
-	touch $$@
-
-.stamp-mxe-$(1)-configure:
-	touch $$@
-
-.PHONY: build-custom-mxe-$(1)
-build-custom-mxe-$(1):
-	PATH="$$$$PATH:$$(dir $$(shell which autopoint))" $$(MAKE) -C $$(TOP)/sdks/builds/toolchains/mxe gcc cmake zlib pthreads dlfcn-win32 mman-win32 \
-		MXE_TARGETS="$(2)-w64-mingw32.static" PREFIX="$$(TOP)/sdks/out/mxe" OS_SHORT_NAME="disable-native-plugins"
-
-.PHONY: setup-custom-mxe-$(1)
-setup-custom-mxe-$(1):
-
-.PHONY: package-mxe-$(1)
-package-mxe-$(1):
-
-.PHONY: clean-mxe-$(1)
-clean-mxe-$(1):
-	$$(MAKE) -C $$(TOP)/sdks/builds/toolchains/mxe clean \
-		MXE_TARGETS="$(2)-w64-mingw32.static" PREFIX="$$(TOP)/sdks/out/mxe-$(1)"
-
-TARGETS += mxe-$(1)
-
-endef
-
-$(eval $(call MxeTemplate,Win32,i686))
-$(eval $(call MxeTemplate,Win64,x86_64))
+.stamp-mxe-toolchain: | $(TOP)/sdks/builds/toolchains/mxe
+	cd $(TOP)/sdks/builds/toolchains/mxe && git checkout $(MXE_HASH)
+	touch $@
+
+.stamp-mxe-configure:
+	touch $@
+
+.PHONY: build-custom-mxe
+build-custom-mxe:
+	PATH="$$PATH:$(dir $(shell which autopoint))" $(MAKE) -C $(TOP)/sdks/builds/toolchains/mxe gcc cmake zlib pthreads dlfcn-win32 mman-win32 \
+		MXE_TARGETS="i686-w64-mingw32.static" PREFIX="$(TOP)/sdks/out/mxe" OS_SHORT_NAME="disable-native-plugins"
+	PATH="$$PATH:$(dir $(shell which autopoint))" $(MAKE) -C $(TOP)/sdks/builds/toolchains/mxe gcc cmake zlib pthreads dlfcn-win32 mman-win32 \
+		MXE_TARGETS="x86_64-w64-mingw32.static" PREFIX="$(TOP)/sdks/out/mxe" OS_SHORT_NAME="disable-native-plugins"
+
+.PHONY: setup-custom-mxe
+setup-custom-mxe:
+
+.PHONY: package-mxe
+package-mxe:
+
+.PHONY: clean-mxe
+clean-mxe:
+	$(MAKE) -C $(TOP)/sdks/builds/toolchains/mxe clean \
+		MXE_TARGETS="i686-w64-mingw32.static" PREFIX="$(TOP)/sdks/out/mxe"
+	$(MAKE) -C $(TOP)/sdks/builds/toolchains/mxe clean \
+		MXE_TARGETS="x86_64-w64-mingw32.static" PREFIX="$(TOP)/sdks/out/mxe"
+
+TARGETS += mxe