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
This commit is contained in:
Christophe de Dinechin 2018-11-04 17:45:32 +01:00
parent 86fd196813
commit b2e1f20c8b
2 changed files with 1 additions and 4 deletions

View File

@ -145,7 +145,7 @@ MAKE_CC= $(CC) $(MIQ_CFLAGS) -c $< -o $@
MAKE_CXX= $(CXX) $(MIQ_CXXFLAGS) -c $< -o $@ MAKE_CXX= $(CXX) $(MIQ_CXXFLAGS) -c $< -o $@
MAKE_AS= $(CC) $(MIQ_CFLAGS) -c $< -o $@ MAKE_AS= $(CC) $(MIQ_CFLAGS) -c $< -o $@
MAKE_LIB= $(AR) $@ $(MIQ_TOLINK) && $(RANLIB) $@ 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) \ -o $(MIQ_DLLNAME) \
-Wl,-rpath -Wl,$(PREFIX_DLL) \ -Wl,-rpath -Wl,$(PREFIX_DLL) \
$(MIQ_SONAME_OPT) \ $(MIQ_SONAME_OPT) \

View File

@ -39,8 +39,5 @@ DLL_EXT= .dll
# MinGW has no 'install' program # MinGW has no 'install' program
INSTALL= cp 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 # All code is PIC in MinGW, so avoid a warning
CFLAGS_PIC= CFLAGS_PIC=