From b1187d9d8aba6f70b1e8f6e97106b9be585ff12c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 15 Jun 2019 10:03:22 +0000 Subject: [PATCH] rules.mk: Use $(CXX) instead of $(LD) for linking CXX is used for linking instead of LD now, since LD might point to the real linker, which doesn't understand -Wl,--blah options, of course. Signed-off-by: Jan Lindemann --- make/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/rules.mk b/make/rules.mk index 15a25be7..04ffb244 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -287,7 +287,7 @@ $(VERSION_SCRIPT): ifneq ($(TARGET),mingw) $(LIB_SO): $(VERSION_SCRIPT) $(LIB_A) $(TOPDIR)/dir_build_LIB.done - $(LD) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \ + $(CXX) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \ $(filter-out -l$(LIBNAME),$(REAL_LDFLAGS)) -o $@ else $(WINRES_RC): $(WINRES_RC_TMPL) @@ -303,7 +303,7 @@ $(WINRES_O): $(WINRES_RC) $(WINDRES) $^ -o $@ $(LIB_SO): $(VERSION_SCRIPT) $(WINRES_O) $(LIB_A) $(TOPDIR)/dir_build_LIB.done - $(LD) -shared -Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | \ + $(CXX) -shared -Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | \ $(SED) 's/-static//'),--output-def,$(LIB_DEF) $(VERSION_SCRIPT) $(LIB_A) $(WINRES_O) \ -Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(REAL_LDFLAGS)) -o $@ $(MSVCPP_IMPLIB): $(LIB_SO)