[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/platform/filter-showIncludes.awk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 77779166569da389de44075b3d03413b353046a4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 9 10:10:57 2017 +0100

    Remove stray CR from input
    
    ...that remained there with recent Cygwin/Bash version, which apparently had
    changes to their Unix-vs.-DOS line end handling
    
    Change-Id: Ib4c7c924362f9e93066e544ed5214fe589aa5336
    Reviewed-on: https://gerrit.libreoffice.org/34990
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/solenv/gbuild/platform/filter-showIncludes.awk b/solenv/gbuild/platform/filter-showIncludes.awk
index 21a4585..6ec13e2 100755
--- a/solenv/gbuild/platform/filter-showIncludes.awk
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -40,6 +40,7 @@ BEGIN {
 }
 
 {
+    sub(/\r$/, "")
     sub(/^ */, "")
     if (index($0, showincludes_prefix) == 1) {
         $0 = substr($0, length(showincludes_prefix) + 1)