From 5f8e536e11e8be936768592b8c24e18350e2f775 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 14 Nov 2019 00:09:54 +0100 Subject: [PATCH] havelib: Revert last change. * build-aux/config.rpath: Revert last change. We can add msys2 support when it has been added to libtool.m4 upstream. --- ChangeLog | 6 ++++++ build-aux/config.rpath | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b97643ffb3..7cc8bdde64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-11-13 Bruno Haible + + havelib: Revert last change. + * build-aux/config.rpath: Revert last change. We can add msys2 support + when it has been added to libtool.m4 upstream. + 2019-11-09 Paul Eggert config: add msys support diff --git a/build-aux/config.rpath b/build-aux/config.rpath index 1644dbd619..be202c1a9e 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -57,7 +57,7 @@ else aix*) wl='-Wl,' ;; - mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -149,7 +149,7 @@ hardcode_direct=no hardcode_minus_L=no case "$host_os" in - cygwin* | msys* | mingw* | pw32* | cegcc*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -198,7 +198,7 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; - cygwin* | msys* | mingw* | pw32* | cegcc*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -348,7 +348,7 @@ else ;; bsdi[45]*) ;; - cygwin* | msys* | mingw* | pw32* | cegcc*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -533,7 +533,7 @@ case "$host_os" in bsdi[45]*) library_names_spec='$libname$shrext' ;; - cygwin* | msys* | mingw* | pw32* | cegcc*) + cygwin* | mingw* | pw32* | cegcc*) shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -- 2.39.5