Skip to contentSkip to conversation

CRDA 0.1.0: Fix building with --as-needed

PATCH In review Tony Vroon 2 participants 2 messages Jan 24, 2009 Kbuild

lore
Share & tools
lore

Tony Vroon

author
#0 lore raw

PATCH 1/1 CRDA 0.1.0: Fix building with --as-needed

It seems mails from Flameeyes just do not make it through to linux-wireless, so there it is. Please apply this and consider releasing 1.0.1 (without a v in the tarball name, if at all possible).

Thanks,
Tony V.

From: Diego E. 'Flameeyes' Pettenò <[email protected]>

For --as-needed to work (and for traditional ld too) the libraries should always be passed _after_ the object files, move them so that they are picked up properly.

Also rename LIBS to NLLIBS to avoid confusion between LIBS/LDLIBS.

---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Makefile +3 -3
index a07fbcf..aaa9ca6 100644
@@ -48,11 +48,11 @@ endif
 
 ifeq ($(NL2FOUND),Y)
 CFLAGS += -DCONFIG_LIBNL20
-LIBS += -lnl-genl
+NLLIBS += -lnl-genl
 NLLIBNAME = libnl-2.0
 endif
 
-LIBS += `pkg-config --libs $(NLLIBNAME)`
+NLLIBS += `pkg-config --libs $(NLLIBNAME)`
 CFLAGS += `pkg-config --cflags $(NLLIBNAME)`
 
 ifeq ($(V),1)

@@ -85,7 +85,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
 
 crda: reglib.o crda.o
 	$(NQ) '  LD  ' $@
-	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ $(LDLIBS)
+	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(NLLIBS)
 
 regdbdump: reglib.o regdbdump.o print-regdom.o
 	$(NQ) '  LD  ' $@
Signature · 1 line
1.6.1