summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2020-09-14 16:10:27 (GMT)
committerMark Brand <mabrand@mabrand.nl>2020-09-14 16:13:07 (GMT)
commiteadc0cdad3429359f414e1516bd3492644e4d272 (patch)
tree0779226a77854b789e5cb02c574174c5f8787b45
parent1901239e8bc171c1a564a13d707094bd7e12e71c (diff)
downloadmxe-eadc0cdad3429359f414e1516bd3492644e4d272.zip
mxe-eadc0cdad3429359f414e1516bd3492644e4d272.tar.gz
mxe-eadc0cdad3429359f414e1516bd3492644e4d272.tar.bz2
mesa: fix build for i686-w64-mingw32 targets
https://github.com/mxe/mxe/issues/2561
-rw-r--r--src/mesa.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/mesa.mk b/src/mesa.mk
index 51a1bc6..a9d0602 100644
--- a/src/mesa.mk
+++ b/src/mesa.mk
@@ -6,12 +6,6 @@ $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)
$(PKG)_DEPS := gcc scons-local
-ifeq (,$(findstring x86_64,$(TARGET)))
- MACHINE=x86_64
-else
- MACHINE=x86
-endif
-
define $(PKG)_BUILD
mkdir -p '$(BUILD_DIR).scons'
$(call PREPARE_PKG_SOURCE,scons-local,'$(BUILD_DIR).scons')
@@ -19,7 +13,7 @@ define $(PKG)_BUILD
MINGW_PREFIX='$(TARGET)-' $(SCONS_LOCAL) \
platform=windows \
toolchain=crossmingw \
- machine=$(MACHINE) \
+ machine=$(if $(findstring x86_64,$(TARGET)),x86_64,x86) \
verbose=1 \
build=release \
libgl-gdi