From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 8 Jul 2018 10:48:13 +0000 (+0200)
Subject: toolchain/nasm: force ar and ranlib only on macOSX
X-Git-Tag: v19.07.0-rc1~3206
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e204717ef2445fc848b0a70374b03b1c8484d176;p=oweals%2Fopenwrt.git

toolchain/nasm: force ar and ranlib only on macOSX

On Debian 9 nasm does not build when we force it to use ranlib, for
macOSX this is needed. Only force this on macOSX and not on any other
OS, this should fix the build of nasm on Linux systems. On my Debian
system the nasm configure script selects  gcc-ranlib and gcc-ar instead.

Fixes: d3a7587eb95 ("toolchain/nasm: fix missing AR/RANLIB variables")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/toolchain/nasm/Makefile b/toolchain/nasm/Makefile
index 8d071033c7..31166358fd 100644
--- a/toolchain/nasm/Makefile
+++ b/toolchain/nasm/Makefile
@@ -24,9 +24,11 @@ HOST_CONFIGURE_ARGS+= \
 		--disable-gdb \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 
-HOST_MAKE_FLAGS = \
-	AR=ar \
-	RANLIB=ranlib
+ifeq ($(HOST_OS),Darwin)
+	HOST_MAKE_FLAGS = \
+		AR=ar \
+		RANLIB=ranlib
+endif
 
 define Host/Prepare
 	$(call Host/Prepare/Default)