From b2e1f20c8bbc61952c7455de54b06a6121fbdb3c Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Sun, 4 Nov 2018 17:45:32 +0100 Subject: [PATCH] Adjustments based on recent observations made on MinGW MinGW now seems to be able to cope with the -rpath option in ld. However, it's necessary to place LDFLAGS after objects, as observed with BUILDENV-specific LDFLAGS, i.e. LDFLAGS_BUILDENV_mingw=-lregex --- config.gnu.mk | 2 +- config.mingw.mk | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config.gnu.mk b/config.gnu.mk index 7c3748b..88fde8a 100644 --- a/config.gnu.mk +++ b/config.gnu.mk @@ -145,7 +145,7 @@ MAKE_CC= $(CC) $(MIQ_CFLAGS) -c $< -o $@ MAKE_CXX= $(CXX) $(MIQ_CXXFLAGS) -c $< -o $@ MAKE_AS= $(CC) $(MIQ_CFLAGS) -c $< -o $@ MAKE_LIB= $(AR) $@ $(MIQ_TOLINK) && $(RANLIB) $@ -MAKE_DLL= $(LD) -shared $(MIQ_LDFLAGS) $(MIQ_LINKARGS) \ +MAKE_DLL= $(LD) -shared $(MIQ_LINKARGS) $(MIQ_LDFLAGS) \ -o $(MIQ_DLLNAME) \ -Wl,-rpath -Wl,$(PREFIX_DLL) \ $(MIQ_SONAME_OPT) \ diff --git a/config.mingw.mk b/config.mingw.mk index 598fb72..f0f5a72 100644 --- a/config.mingw.mk +++ b/config.mingw.mk @@ -39,8 +39,5 @@ DLL_EXT= .dll # MinGW has no 'install' program INSTALL= cp -# Do not add an rpath option on Windows -MAKE_DLL= $(LD) -shared $(MIQ_LDFLAGS) $(MIQ_TOLINK)-o $@ - # All code is PIC in MinGW, so avoid a warning CFLAGS_PIC=