From 24d071c246a9d0e6c0277451d730e1d425254f40 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 8 Jul 2018 12:48:13 +0200 Subject: [PATCH] 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 (backported from e204717ef2445fc848b0a70374b03b1c8484d176) --- toolchain/nasm/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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) -- 2.30.2