From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 22 Aug 2015 10:30:38 +0000 (+0200)
Subject: unzip: Fix build on x86_64
X-Git-Tag: v2.17-core94~37^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f89a6efd515fb52c8391a26f4bf4f2d9112f135f;p=ipfire-2.x.git

unzip: Fix build on x86_64

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/unzip b/lfs/unzip
index 2013cc1327..f479d7e9f9 100644
--- a/lfs/unzip
+++ b/lfs/unzip
@@ -70,11 +70,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(MACHINE_TYPE)" "arm"
-	# ARM cannot use the x86 assembly code.
-	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
-else
+ifeq "$(MACHINE)" "i586"
 	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
+else
+	# ARM/x86_64 cannot use the x86 32 bit assembly code.
+	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
 endif
 	cd $(DIR_APP) && make prefix=/usr install
 	@rm -rf $(DIR_APP)