summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--toolchain/gmp/Makefile6
2 files changed, 8 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 021970245..f0dc67194 100644
--- a/Makefile
+++ b/Makefile
@@ -191,7 +191,9 @@ NO_ERROR=0
echo "GMAKE:=$$(which gmake)" >>prereq.mk ;\
fi
@echo "GNU_HOST_NAME:=$$(${CC} -dumpmachine)" >>prereq.mk
- @echo "ARCH_FOR_BUILD:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \
+ @echo "ARCH_FOR_BUILD:=$$(${CC} -dumpmachine | sed \
+ -e 's/x86_64-linux-gnux32/x32/' \
+ -e s'/-.*//' \
-e 's/sparc.*/sparc/' \
-e 's/armeb.*/armeb/g' \
-e 's/arm.*/arm/g' \
diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile
index a8ec71088..fbc8687e0 100644
--- a/toolchain/gmp/Makefile
+++ b/toolchain/gmp/Makefile
@@ -10,6 +10,10 @@ ifeq (${ADK_MAKE_PARALLEL},y)
GMP_MAKEOPTS+= -j${ADK_MAKE_JOBS}
endif
+ifeq (${ARCH_FOR_BUILD},x32)
+GMP_CONFOPTS+= ABI=x32
+endif
+
$(WRKBUILD)/.headers:
$(WRKBUILD)/.configured:
ifneq ($(OStype),Darwin)
@@ -17,7 +21,7 @@ ifneq ($(OStype),Darwin)
endif
(cd $(WRKBUILD); \
PATH="$(STAGING_HOST_DIR)/usr/bin:$$PATH" \
- ./configure \
+ ./configure ${GMP_CONFOPTS} \
--prefix=$(STAGING_HOST_DIR)/usr \
--with-pic \
--disable-shared \