From: Felix Fietkau <nbd@nbd.name>
Date: Tue, 10 Jul 2018 11:08:30 +0000 (+0200)
Subject: nasm: disable LTO, remove host specific workarounds
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a5188eb2584c244246f2be638a54bc458ecfc497;p=openwrt%2Fstaging%2Fxback.git

nasm: disable LTO, remove host specific workarounds

The recent build failures on various platforms were apparently caused by
the fact that LTO build support in the configure script does not check
if it has a suitable version of gcc and simply assumes that gcc-ar is
available and can be used for intermediate files.

Since we really don't need to build nasm with LTO, simply disable it and
keep the whole build more portable

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/toolchain/nasm/Makefile b/toolchain/nasm/Makefile
index 31166358fd..53b7848caf 100644
--- a/toolchain/nasm/Makefile
+++ b/toolchain/nasm/Makefile
@@ -19,17 +19,11 @@ include $(INCLUDE_DIR)/toolchain-build.mk
 HOST_CONFIGURE_ARGS+= \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--with-sysroot=$(TOOLCHAIN_DIR) \
-		--enable-lto \
+		--disable-lto \
 		--disable-werror \
 		--disable-gdb \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 
-ifeq ($(HOST_OS),Darwin)
-	HOST_MAKE_FLAGS = \
-		AR=ar \
-		RANLIB=ranlib
-endif
-
 define Host/Prepare
 	$(call Host/Prepare/Default)
 	ln -snf $(notdir $(HOST_BUILD_DIR)) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)