summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-09 10:10:57 +0100
committerMichael Stahl <mstahl@redhat.com>2017-03-09 21:52:20 +0000
commit62c837748662d304de8a70a1825c304d72f11178 (patch)
tree3355b64a28053cf7a48fe0eb16fa9045e2de2507 /solenv
parenta99f52608f38fb6be309fdfa22c7f4c418031394 (diff)
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@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 77779166569da389de44075b3d03413b353046a4) Reviewed-on: https://gerrit.libreoffice.org/35019 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/gbuild/platform/filter-showIncludes.awk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/filter-showIncludes.awk b/solenv/gbuild/platform/filter-showIncludes.awk
index 21a458521308..6ec13e2fdb4c 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)