janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 13:47:39 +01:00
Code Activity

rules.mk: Specify linker in LD variable instead of CC

Browse source
This commit is contained in:
Jan Lindemann 2007-08-02 18:53:51 +00:00 • committed by Jan Lindemann
commit 0affdb8333
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/rules.mk
View file

@ -56,10 +56,10 @@ endif
ifeq ($(LIBTYPE),shared) ifeq ($(LIBTYPE),shared)
lib%.so: %.o # $(LIB_SO) lib%.so: %.o # $(LIB_SO)
$(CC) -shared $(LDFLAGS) $^ -o $@ $(LD) -shared $(LDFLAGS) $^ -o $@
else else
lib%.so: %.o lib%.so: %.o
$(CC) $(LDFLAGS) $^ -o $@ $(LD) $(LDFLAGS) $^ -o $@
endif endif
$(VERSION_SCRIPT): $(VERSION_SCRIPT):
@ -67,11 +67,11 @@ $(VERSION_SCRIPT):
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
$(LIB_SO): $(VERSION_SCRIPT) $(LIB_A) $(LIB_SO): $(VERSION_SCRIPT) $(LIB_A)
$(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \ $(LD) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \
$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@ $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
else else
$(LIB_SO): $(VERSION_SCRIPT) $(LIB_A) $(LIB_SO): $(VERSION_SCRIPT) $(LIB_A)
$(CC) -shared \ $(LD) -shared \
-Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | sed 's/-static//'),--output-def,$(LIB_DEF) \ -Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | sed 's/-static//'),--output-def,$(LIB_DEF) \
$(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@ $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
$(MSVCPP_IMPLIB): $(LIB_SO) $(MSVCPP_IMPLIB): $(LIB_SO)