mirror of
https://github.com/fail0verflow/switch-coreboot.git
synced 2025-05-04 01:39:18 -04:00
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 <patrick@georgi-clan.de> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://coreboot.org/repository/coreboot-v3@690 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
parent
e1ef6d2dc8
commit
ae2520e4bd
2 changed files with 6 additions and 6 deletions
|
@ -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"
|
||||
|
|
|
@ -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/
|
||||
|
|
Loading…
Add table
Reference in a new issue