From b6abc337906e43f92f50e075f49df407946fc6fe Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 25 Oct 2017 01:33:27 -0400 Subject: build system: PE targets: added mdso-based import library generation support. --- sysinfo/os/pe.mk | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'sysinfo/os/pe.mk') diff --git a/sysinfo/os/pe.mk b/sysinfo/os/pe.mk index bbb74b2..1b02484 100644 --- a/sysinfo/os/pe.mk +++ b/sysinfo/os/pe.mk @@ -19,9 +19,6 @@ implib-solink: shared-lib $(IMPLIB_SOLINK) $(IMPLIB_DEF): shared-lib -$(IMPLIB_VER): $(IMPLIB_DEF) - $(DLLTOOL) -l $(IMPLIB_VER) -d $(IMPLIB_DEF) -D $(DSO_VER) - install-implib: install-implib-ver \ package-install-implib-soname \ package-install-implib-solink @@ -38,6 +35,20 @@ clean-implib: rm -f $(IMPLIB_SOLINK) +ifeq ($(OS_IMPLIB_TOOL),mdso) + +$(IMPLIB_VER): $(IMPLIB_DEF) + $(MDSO) -m $(HOST_BITS) -i $(IMPLIB_VER) -n $(DSO_VER) $(IMPLIB_DEF) + +else ifeq ($(OS_IMPLIB_TOOL),dlltool) + +$(IMPLIB_VER): $(IMPLIB_DEF) + $(DLLTOOL) -l $(IMPLIB_VER) -d $(IMPLIB_DEF) -D $(DSO_VER) + +endif + + + ifeq ($(AVOID_VERSION),yes) package-implib-soname: @@ -53,9 +64,19 @@ package-install-implib-soname: install-implib-soname package-install-implib-solink: install-implib-solink +ifeq ($(OS_IMPLIB_TOOL),mdso) + +$(IMPLIB_SONAME): $(IMPLIB_DEF) + $(MDSO) -m $(HOST_BITS) -i $(IMPLIB_SONAME) -n $(DSO_SONAME) $(IMPLIB_DEF) + +else ifeq ($(OS_IMPLIB_TOOL),dlltool) + $(IMPLIB_SONAME): $(IMPLIB_DEF) $(DLLTOOL) -l $(IMPLIB_SONAME) -d $(IMPLIB_DEF) -D $(DSO_SONAME) +endif + + $(IMPLIB_SOLINK): $(IMPLIB_SONAME) rm -f $(IMPLIB_SOLINK).tmp ln -s $(IMP_SONAME) $(IMPLIB_SOLINK).tmp -- cgit v1.2.3