From: Felix Fietkau Date: Wed, 7 Jun 2017 16:14:27 +0000 (+0200) Subject: kernel: fix segmentation fault in mconf on linux X-Git-Tag: v19.07.0-rc1~6311 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fec38ebf0d0ffba22937e181941cea7d9cddf808;p=openwrt%2Fstaging%2Fhauke.git kernel: fix segmentation fault in mconf on linux Commit 86c966a8ae9c4e74b912a16a760aaed17c68eb32 caused HOST_LOADLIBES to include -lncurses. This was added for fixing build issues on macOS. This introduces issues on Linux when wide-character ncurses is being used for compiling, but the non-wide-character version is linked in. Fix this by adding the extra override for HOST_LOADLIBES only on macOS. Signed-off-by: Felix Fietkau --- diff --git a/include/kernel-build.mk b/include/kernel-build.mk index e98d801939..e45b43f00a 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -159,7 +159,9 @@ define BuildKernel rm -f $(LINUX_DIR)/.config.prev rm -f $(STAMP_CONFIGURED) $(LINUX_RECONF_CMD) > $(LINUX_DIR)/.config - $(_SINGLE)$(KERNEL_MAKE) HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib -lncurses" $$@ + $(_SINGLE)$(KERNEL_MAKE) \ + $(if $(findstring Darwin,$(HOST_OS)),HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib -lncurses") \ + $$@ $(LINUX_RECONF_DIFF) $(LINUX_DIR)/.config > $(LINUX_RECONFIG_TARGET) install: $(LINUX_DIR)/.image