From 3472f8de0f869ccf1bef9094b926f221023611ad Mon Sep 17 00:00:00 2001 From: Stas Sergeev Date: Thu, 26 Dec 2024 17:08:40 +0300 Subject: [PATCH] make: honour LDFLAGS variable --- dj64.mk | 2 +- src/djdev64/makefile | 2 +- src/djdev64/stub/makefile | 2 +- src/libc/dj64/makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dj64.mk b/dj64.mk index 31a5eff2..21866bd2 100644 --- a/dj64.mk +++ b/dj64.mk @@ -66,7 +66,7 @@ ifneq ($(PREFIX),) RP += -Wl,-rpath=$(PREFIX)/i386-pc-dj64/lib64 endif # sort removes duplicates -DJLDFLAGS = $(shell pkg-config --libs dj64) $(sort $(RP)) +DJLDFLAGS = $(shell pkg-config --libs dj64) $(sort $(RP)) $(LDFLAGS) endif DJ64_XLIB = libtmp.so ifneq ($(AS_OBJECTS),) diff --git a/src/djdev64/makefile b/src/djdev64/makefile index 797118d2..9b9cc7a6 100644 --- a/src/djdev64/makefile +++ b/src/djdev64/makefile @@ -33,7 +33,7 @@ $(LIBDIR): mkdir $@ $(LIB): $(OBJECTS) | $(LIBDIR) - $(CC) -shared -Wl,-Bsymbolic -Wl,-soname=$(LIBN) -o $@ $^ $(LIBELF) + $(CC) $(LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$(LIBN) -o $@ $^ $(LIBELF) $(LIBDIR)/libdjdev64.so: $(LIB) ln -sf $(LIBN) $@ diff --git a/src/djdev64/stub/makefile b/src/djdev64/stub/makefile index 30af7ac7..b93fa65b 100644 --- a/src/djdev64/stub/makefile +++ b/src/djdev64/stub/makefile @@ -27,7 +27,7 @@ $(LIBDIR): mkdir $@ $(LIB): $(OBJECTS) libdjstub.version | $(LIBDIR) - $(CC) -shared -Wl,-Bsymbolic -Wl,-soname=$(LIBN) \ + $(CC) $(LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$(LIBN) \ -Wl,--version-script=libdjstub.version -o $@ $(OBJECTS) $(LIBDIR)/libdjstub64.so: $(LIB) diff --git a/src/libc/dj64/makefile b/src/libc/dj64/makefile index 8a748891..cce32d7a 100644 --- a/src/libc/dj64/makefile +++ b/src/libc/dj64/makefile @@ -70,7 +70,7 @@ uplt.o: uplt.S plt_defs.inc ALL_OBJS = $(addprefix ../,$(file < $(TOP)/makefile.rf)) $(LIB)/$(LIBN): $(TOP)/makefile.rf $(ALL_OBJS) \ thunk_calls.h thunk_asms.h $(OBJECTS) - $(XGCC) -shared -Wl,--no-undefined -Wl,--as-needed -Wl,-soname=$(LIBN) -Wl,-Bsymbolic -o $@ \ + $(XGCC) $(LDFLAGS) -shared -Wl,--no-undefined -Wl,--as-needed -Wl,-soname=$(LIBN) -Wl,-Bsymbolic -o $@ \ $(ALL_OBJS) $(OBJECTS) @echo "Have `nm -u $@ | grep "U " | wc -l` undefined symbols"