diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-11-22 14:50:27 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-11-22 14:50:27 +0100 |
| commit | 811c5336e00e3357afeb0909a4d182d0c3bb6ad4 (patch) | |
| tree | fe10b6cb9309bef50e7458c5c203905b43529d24 /build-aux/ar-lib | |
| parent | 62ac2dd91f81d8584d5ab585639dfe29eefc3e20 (diff) | |
| parent | 80101a458f40cc35f39e890baba1a891a83009e7 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'build-aux/ar-lib')
| -rwxr-xr-x | build-aux/ar-lib | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/build-aux/ar-lib b/build-aux/ar-lib index 1521987..d0a7b5c 100755 --- a/build-aux/ar-lib +++ b/build-aux/ar-lib @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2024-06-19.01; # UTC +scriptversion=2025-02-03.05; # UTC -# Copyright (C) 2010-2024 Free Software Foundation, Inc. +# Copyright (C) 2010-2025 Free Software Foundation, Inc. # Written by Peter Rosin <peda@lysator.liu.se>. # # This program is free software; you can redistribute it and/or modify @@ -51,9 +51,20 @@ func_file_conv () # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -65,8 +76,8 @@ func_file_conv () mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin | msys) - file=`cygpath -m "$file" || echo "$file"` + cygwin) + file=`cygpath -w "$file" || echo "$file"` ;; wine) file=`winepath -w "$file" || echo "$file"` |