From 2c2796719afce7b7a64fa1dd0bec736b10e371da Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 19 Jun 2008 08:11:35 +0000 Subject: [PATCH] package/config: cygwin fix - pass HOST_LOADLIBES down to make mconf for cygwin - fix link-order WRT HOST_LOADLIBES From Bernhards tree (91018d95) --- Makefile | 2 ++ package/config/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index caabd690cf..73d92088af 100644 --- a/Makefile +++ b/Makefile @@ -170,6 +170,8 @@ ifneq ($(findstring cygwin,$(BR2_GNU_BUILD_SUFFIX)),) HOST_EXEEXT:=.exe HOST_LIBEXT:=.lib HOST_SHREXT:=.dll +HOST_LOADLIBES="-lcurses -lintl" +export HOST_LOADLIBES endif ifneq ($(findstring mingw,$(BR2_GNU_BUILD_SUFFIX)),) HOST_EXEEXT:=.exe diff --git a/package/config/Makefile b/package/config/Makefile index beed4584aa..3af4bd8de6 100644 --- a/package/config/Makefile +++ b/package/config/Makefile @@ -17,10 +17,10 @@ host-cmulti := $(foreach m,$(__hostprogs),\ host-cobjs := $(sort $(foreach m,$(__hostprogs),$($(m)-objs))) $(host-csingle): %: %.c - $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(HOST_LOADLIBES) $< -o $@ + $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $@ $(host-cmulti): %: $(host-cobjs) $(host-cshlib) - $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(HOST_LOADLIBES) $($@-objs) -o $@ + $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $($@-objs) $(HOST_LOADLIBES) -o $@ $(host-cobjs): %.o: %.c $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) -c $< -o $@ -- 2.30.2