diff options
| author | Bruno Haible <bruno@clisp.org> | 2019-07-04 03:43:54 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2019-07-04 03:43:54 +0200 |
| commit | 20f739e6f739f67bb8afafffaaa68b388769b100 (patch) | |
| tree | 05f5433b70d686e4566e5141e00cff9e6edda343 | |
| parent | 6624f88b2ea685e5c44c7373d01df488d1dabd19 (diff) | |
| download | automake-20f739e6f739f67bb8afafffaaa68b388769b100.tar.gz | |
ar-lib: Fix for MSVC 14.
* lib/ar-lib (extract): Convert CRLFs in 'lib -NOLOGO -LIST' output to LFs.
| -rwxr-xr-x | lib/ar-lib | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/ar-lib b/lib/ar-lib index 0baa4f607..f64465e4f 100755 --- a/lib/ar-lib +++ b/lib/ar-lib @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-03-01.08; # UTC +scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2019 Free Software Foundation, Inc. # Written by Peter Rosin <peda@lysator.liu.se>. # # This program is free software; you can redistribute it and/or modify @@ -224,10 +224,11 @@ elif test -n "$extract"; then esac done else - $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member - do - $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? - done + $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \ + | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done fi elif test -n "$quick$replace"; then |