From b69287c10456cd47113d9a6b87e5fe246742e167 Mon Sep 17 00:00:00 2001 From: midipix Date: Jun 05 2018 12:30:04 +0000 Subject: build system: PE targets: mdso integration: support non-default --libpath. --- diff --git a/sysinfo/os/pe.mk b/sysinfo/os/pe.mk index 1b02484..e8e1759 100644 --- a/sysinfo/os/pe.mk +++ b/sysinfo/os/pe.mk @@ -6,6 +6,7 @@ LDFLAGS_SONAME += -Wl,-soname LDFLAGS_SONAME += -Wl,$(DSO_SONAME) LDFLAGS_SHARED += $(LDFLAGS_SONAME) +DSO_LIBPATH ?= loader PE_SUBSYSTEM ?= windows LDFLAGS_COMMON += -Wl,--subsystem=$(PE_SUBSYSTEM) @@ -38,7 +39,7 @@ clean-implib: ifeq ($(OS_IMPLIB_TOOL),mdso) $(IMPLIB_VER): $(IMPLIB_DEF) - $(MDSO) -m $(HOST_BITS) -i $(IMPLIB_VER) -n $(DSO_VER) $(IMPLIB_DEF) + $(MDSO) -m $(HOST_BITS) -i $(IMPLIB_VER) -n $(DSO_VER) -l $(DSO_LIBPATH) $< else ifeq ($(OS_IMPLIB_TOOL),dlltool)