solenv/gbuild/platform/filter-creatingLibrary.awk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
New commits: commit 39d18384121768460775b5ec320e444b022f5646 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Fri Feb 23 14:02:50 2024 +0600 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Fri Feb 23 11:25:14 2024 +0100 Suppress linker warnings for CLR objects climaker_app.o : /DEBUG:FASTLINK is not supported when managed code is present; restarting link with /DEBUG:FULL Change-Id: Ia4c8ef862999650b317629273996166908232494 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163804 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/solenv/gbuild/platform/filter-creatingLibrary.awk b/solenv/gbuild/platform/filter-creatingLibrary.awk index 231609feb2d5..625af2891c0e 100755 --- a/solenv/gbuild/platform/filter-creatingLibrary.awk +++ b/solenv/gbuild/platform/filter-creatingLibrary.awk @@ -15,6 +15,7 @@ BEGIN { creatinglibrary_prefix = ENVIRON["CREATINGLIBRARY_PREFIX"]; generatingcode_message = ENVIRON["GENERATINGCODE_MESSAGE"]; finishedgeneratingcode_message = ENVIRON["FINISHEDGENERATINGCODE_MESSAGE"]; + fastlink_in_clr_message = ENVIRON["FASTLINK_IN_CLR_MESSAGE"]; if (!creatinglibrary_prefix) { creatinglibrary_prefix = "\.lib.*\.exp" } @@ -24,23 +25,32 @@ BEGIN { if (!finishedgeneratingcode_message) { finishedgeneratingcode_message = "Finished generating code" } + if (!fastlink_in_clr_message) { + fastlink_in_clr_message = "DEBUG:FASTLINK.*DEBUG:FULL" + } firstline = 1 } { + keep_firstline = 0 if (firstline && match($0, creatinglibrary_prefix)) { # ignore } else if (match($0, generatingcode_message)) { # ignore } else if (match($0, finishedgeneratingcode_message)) { # ignore + } else if (match($0, fastlink_in_clr_message)) { + # ignore; "Creating library" will come after this warning + keep_firstline = 1 } 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 + if (!keep_firstline) { + firstline = 0 + } } # vim: set noet sw=4 ts=4: