From: Paul Eggert Date: Sat, 9 Nov 2019 20:02:24 +0000 (-0800) Subject: config: add msys support X-Git-Tag: v1.0~4613 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=ba23291b7fcee22cacfd83c29de35548b56c2aa3;p=gnulib.git config: add msys support Requested by Arnold Robbins in: https://lists.gnu.org/r/bug-gnulib/2019-11/msg00008.html He also requested a change to config.guess, which I’ll forward upstream. * build-aux/ar-lib (func_file_conv): * build-aux/compile (func_file_conv): * build-aux/config.rpath (wl, with_gnu_ld) (hardcode_libdir_flag_spec, libext, shrext, library_names_spec): Treat msys like cygwin. --- diff --git a/ChangeLog b/ChangeLog index 1400624d41..b97643ffb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2019-11-09 Paul Eggert + + config: add msys support + Requested by Arnold Robbins in: + https://lists.gnu.org/r/bug-gnulib/2019-11/msg00008.html + He also requested a change to config.guess, which I’ll forward + upstream. + * build-aux/ar-lib (func_file_conv): + * build-aux/compile (func_file_conv): + * build-aux/config.rpath (wl, with_gnu_ld) + (hardcode_libdir_flag_spec, libext, shrext, library_names_spec): + Treat msys like cygwin. + 2019-11-06 Paul Eggert regex: now back in sync with glibc diff --git a/build-aux/ar-lib b/build-aux/ar-lib index f64465e4f4..be8806a2fe 100755 --- a/build-aux/ar-lib +++ b/build-aux/ar-lib @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -65,7 +65,7 @@ func_file_conv () mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin) + cygwin | msys) file=`cygpath -m "$file" || echo "$file"` ;; wine) diff --git a/build-aux/compile b/build-aux/compile index d23d320dd1..be68b4b287 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff --git a/build-aux/config.rpath b/build-aux/config.rpath index be202c1a9e..1644dbd619 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -57,7 +57,7 @@ else aix*) wl='-Wl,' ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -149,7 +149,7 @@ hardcode_direct=no hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | 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* | mingw* | pw32* | cegcc*) + cygwin* | msys* | 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* | mingw* | pw32* | cegcc*) + cygwin* | msys* | 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* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;;