From ae2520e4bdd4b488d4a0a50da1d3848a06c9f854 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 6 Jun 2008 20:47:42 +0000 Subject: [PATCH] Order libraries last on the command line when building kconfig and lxdialog, so that their content is used to resolve unknown symbols even when they are static libraries. Also fix HOST_LOADLIBS typo. Signed-Off-By: Patrick Georgi Acked-by: Peter Stuge git-svn-id: svn://coreboot.org/repository/coreboot-v3@690 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- util/kconfig/Makefile | 4 ++-- util/kconfig/lxdialog/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile index 98621be33e..a7c712e9f4 100644 --- a/util/kconfig/Makefile +++ b/util/kconfig/Makefile @@ -102,11 +102,11 @@ gconf-objects := gconf.o kconfig_load.o zconf.tab.o $(obj)/util/kconfig/mconf: $(patsubst %,$(obj)/util/kconfig/%,$(mconf-objects)) $(Q)printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(HOSTCC) $(CURSESLIBS) $(INTLLIBS) -o $@ $^ + $(Q)$(HOSTCC) -o $@ $^ $(CURSESLIBS) $(INTLLIBS) $(obj)/util/kconfig/conf: $(patsubst %,$(obj)/util/kconfig/%,$(conf-objects)) $(Q)printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(HOSTCC) $(CURSESLIBS) -o $@ $^ + $(Q)$(HOSTCC) -o $@ $^ $(CURSESLIBS) $(obj)/util/kconfig/qconf: $(patsubst %,$(obj)/util/kconfig/%,$(qconf-objects)) $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" diff --git a/util/kconfig/lxdialog/Makefile b/util/kconfig/lxdialog/Makefile index f37ca4bbcc..d643ce3ff6 100644 --- a/util/kconfig/lxdialog/Makefile +++ b/util/kconfig/lxdialog/Makefile @@ -8,14 +8,14 @@ check-lxdialog := $(src)/util/kconfig/lxdialog/check-lxdialog.sh # Use recursively expanded variables so we do not call gcc unless # we really need to do so. (Do not call gcc as part of make mrproper) HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) -HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) +HOST_LOADLIBS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) HOST_EXTRACFLAGS += -DLOCALE .PHONY: dochecklxdialog $(obj)/dochecklxdialog: $(Q)printf " CHECK $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES) + $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBS) always := lxdialog dochecklxdialog @@ -24,8 +24,8 @@ lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \ $(obj)/util/kconfig/lxdialog/lxdialog: $(obj)/dochecklxdialog $(patsubst %,$(obj)/util/kconfig/lxdialog/%,$(lxdialog-objs)) $(Q)printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(HOSTCC) $(HOST_LOADLIBES) \ - $(patsubst %,$(obj)/util/kconfig/lxdialog/%,$(lxdialog-objs)) -o $@ + $(Q)$(HOSTCC) \ + $(patsubst %,$(obj)/util/kconfig/lxdialog/%,$(lxdialog-objs)) -o $@ $(HOST_LOADLIBS) $(obj)/util/kconfig/lxdialog/%.o: $(src)/util/kconfig/lxdialog/%.c $(Q)mkdir -p $(obj)/util/kconfig/lxdialog/