diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-13 12:39:44 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-10-14 21:34:24 +0200 |
| commit | e4af0d08dbb05cb51c3df198b1768adbb0c31deb (patch) | |
| tree | a57569ba3d98165453b0b8653e0e083f6375c9cb | |
| parent | e2e80480c8c1f5712e89d1b369393f9126af0367 (diff) | |
filter out cl.exe printing source file name also when not using deps
This is what filter-showIncludes.awk does as a side-effect, so
this is for the --disable-dependency-tracking case.
Change-Id: I0fd58ff4e343c6322e9cba641acd5fa2bf3816f4
Reviewed-on: https://gerrit.libreoffice.org/80731
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 1 | ||||
| -rwxr-xr-x | solenv/gbuild/platform/filter-sourceName.awk | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index b604d10d3760..9c0425c7efec 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -275,6 +275,7 @@ endef else gb_COMPILERDEPFLAGS := define gb_create_deps +| LC_ALL=C $(GBUILDDIR)/platform/filter-sourceName.awk; exit $${PIPESTATUS[0]} endef endif diff --git a/solenv/gbuild/platform/filter-sourceName.awk b/solenv/gbuild/platform/filter-sourceName.awk new file mode 100755 index 000000000000..d55e2707d51b --- /dev/null +++ b/solenv/gbuild/platform/filter-sourceName.awk @@ -0,0 +1,32 @@ +#!/usr/bin/gawk -f +# -*- tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# Filter out the "sourcefile.cxx" message printed by cl.exe, +# as there is no way to disable it. This file is used +# in place of filter-showIncludes.awk (which does the same) +# when --disable-dependency-tracking is used. + +BEGIN { + firstline = 1 +} + +{ + if (firstline) { + # ignore + } else { + # because MSVC stupidly prints errors on stdout, it's + # necessary to forward everything that isn't matched by the pattern + # so users get to see them. + print $0 > "/dev/stderr" + } + firstline = 0 +} + +# vim: set noet sw=4 ts=4: |