Fix Android build for mxe (#7782)

mono · Mar 23, 2018 · 2487301 · 2487301
1 parent 0d6be4d
commit 2487301
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/sdks/builds/mxe.mk b/sdks/builds/mxe.mk
@@ -1,4 +1,6 @@
 
+MXE_PREFIX?=$(TOP)/sdks/out/mxe
+
 $(TOP)/sdks/builds/toolchains/mxe:
 	git clone -b xamarin https://github.com/xamarin/mxe.git $@
 
@@ -11,10 +13,9 @@ $(TOP)/sdks/builds/toolchains/mxe:
 
 .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"
+	$(MAKE) -C $(TOP)/sdks/builds/toolchains/mxe gcc cmake zlib pthreads dlfcn-win32 mman-win32 \
+		MXE_TARGETS="i686-w64-mingw32.static x86_64-w64-mingw32.static" PREFIX="$(MXE_PREFIX)"
+			OS_SHORT_NAME="disable-native-plugins" PATH="$$PATH:$(dir $(shell brew list gettext | grep autopoint$))"
 
 .PHONY: setup-custom-mxe
 setup-custom-mxe:
@@ -24,9 +25,6 @@ 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"
+	rm -rf $(TOP)/sdks/builds/toolchains/mxe $(MXE_PREFIX)
 
 TARGETS += mxe
diff --git a/sdks/versions.mk b/sdks/versions.mk
@@ -1,7 +1,7 @@
 
 # MXE
 
-MXE_HASH?=a926b16d8e07b6125484223794b412f89b9acce0
+MXE_HASH?=b9cbb53541a0e10fe4fe81f22bd586cb9cdc922a
 
 # LLVM