| diff -Naur icu-orig/source/config/mh-mingw icu/source/config/mh-mingw |
| --- icu-orig/source/config/mh-mingw 2018-03-01 10:09:22.529832000 +0300 |
| +++ icu/source/config/mh-mingw 2018-03-01 10:09:23.060232900 +0300 |
| @@ -41,8 +41,8 @@ |
| LD_SOOPTIONS= -Wl,-Bsymbolic |
| |
| ## Commands to make a shared library |
| -SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# |
| -SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# |
| +SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# |
| +SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# |
| |
| ## Compiler switch to embed a runtime search path |
| LD_RPATH= |
| @@ -75,7 +75,7 @@ |
| # This is also for backwards compatibility. |
| DATA_STUBNAME = dt |
| I18N_STUBNAME = in |
| -LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) |
| +LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) |
| |
| #SH### copied from Makefile.inc |
| #SH## for icu-config to test with |
| @@ -127,7 +127,7 @@ |
| FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) |
| MIDDLE_SO_TARGET=$(FINAL_SO_TARGET) |
| |
| -FINAL_IMPORT_LIB = $(dir $(SO_TARGET))lib$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# |
| +FINAL_IMPORT_LIB = $(dir $(SO_TARGET))$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# |
| IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# |
| MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# |
| |
| diff -Naur icu-orig/source/config/mh-mingw64 icu/source/config/mh-mingw64 |
| --- icu-orig/source/config/mh-mingw64 2018-03-01 10:09:22.545432000 +0300 |
| +++ icu/source/config/mh-mingw64 2018-03-01 10:09:23.060232900 +0300 |
| @@ -41,8 +41,8 @@ |
| LD_SOOPTIONS= -Wl,-Bsymbolic |
| |
| ## Commands to make a shared library |
| -SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# |
| -SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# |
| +SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# |
| +SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# |
| |
| ## Compiler switch to embed a runtime search path |
| LD_RPATH= |
| @@ -63,19 +63,19 @@ |
| endif |
| |
| # Static library prefix and file extension |
| -LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) |
| +LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) |
| A = a |
| |
| ## An import library is needed for z/OS and MSVC |
| IMPORT_LIB_EXT = .dll.a |
| |
| -LIBPREFIX= |
| +LIBPREFIX=lib |
| |
| # Change the stubnames so that poorly working FAT disks and installation programs can work. |
| # This is also for backwards compatibility. |
| DATA_STUBNAME = dt |
| I18N_STUBNAME = in |
| -LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) |
| +LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) |
| |
| #SH### copied from Makefile.inc |
| #SH## for icu-config to test with |
| @@ -127,7 +127,7 @@ |
| FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) |
| MIDDLE_SO_TARGET=$(FINAL_SO_TARGET) |
| |
| -FINAL_IMPORT_LIB = $(dir $(SO_TARGET))lib$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# |
| +FINAL_IMPORT_LIB = $(dir $(SO_TARGET))$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# |
| IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# |
| MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# |
| |