From d46754aaebe873c0a1405ee3fa9bafef335cfff3 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 7 Jul 2018 14:50:51 +0200 Subject: [PATCH] toolchain/nasm: fix missing AR/RANLIB variables Fixes build on macOS Signed-off-by: Felix Fietkau (backported from d3a7587eb95e6e8c85ff0e57504bc31d1e1b8523) --- toolchain/nasm/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/toolchain/nasm/Makefile b/toolchain/nasm/Makefile index a39c71f65f..8d071033c7 100644 --- a/toolchain/nasm/Makefile +++ b/toolchain/nasm/Makefile @@ -24,6 +24,10 @@ HOST_CONFIGURE_ARGS+= \ --disable-gdb \ $(SOFT_FLOAT_CONFIG_OPTION) \ +HOST_MAKE_FLAGS = \ + AR=ar \ + RANLIB=ranlib + define Host/Prepare $(call Host/Prepare/Default) ln -snf $(notdir $(HOST_BUILD_DIR)) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) @@ -37,12 +41,9 @@ define Host/Configure $(call Host/Configure/Default) endef -define Host/Compile - +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all -endef - define Host/Install $(MAKE) -C $(HOST_BUILD_DIR) \ + $(HOST_MAKE_FLAGS) \ prefix=$(TOOLCHAIN_DIR) \ install endef -- 2.30.2