solenv/gbuild/platform/com_GCC_defs.mk | 2 --
1 file changed, 2 deletions(-)
New commits:
commit e3f8a433799b2ccc2f16ba7691f790bd98febb16
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Tue Jun 7 12:04:27 2022 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Wed Jun 8 14:13:54 2022 +0200
it is not our job to tell GCC whether to colorize its output
GCC's -fdiagnostics-color option is complex (read: brain-damaged),
since it depends on how the compiler was configured during building it
(https://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Message-Formatting-Options.html).
So while with Clang coloring works out of the box and the option
can be used for force it in special cases, GCC depending on how
it's been built may (or may not) require the option explicitly
just to do the sane default. 13b52f50e52d226c935dcb94fac641c59a77f13f
added an explicitly =auto to handle that, and then
9ab2703d5c212746c961dcb238a4c3025d3a2587 changed it to =always
depending on gb_COLOR to prevent it from overriding
explicitly used option. This results in a possible massive rebuild
when redirecting build output (because e.g. PCHs get rebuilt if
build flags change, and ccache I think cannot use cached compilations
either).
It should not be gbuild's job to go out of its way to handle broken
tooling, so just revert both of those. If somebody uses such a lame
GCC build, either don't do that, add those explicit flags
to CXX/ENVCFLAGSCXX, or create a clean way to add flags to CXXFLAGS
or something.
Change-Id: Ieac6ac7dd198639529aba8f47983587771772349
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135467
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index f16eb8ec282c..004945a32d32 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -75,7 +75,6 @@ gb_CFLAGS_COMMON := \
-fno-common \
-pipe \
$(if $(filter
EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
- $(if $(gb_COLOR),-fdiagnostics-color=always) \
gb_CXXFLAGS_COMMON := \
-Wall \
@@ -93,7 +92,6 @@ gb_CXXFLAGS_COMMON := \
-fno-common \
-pipe \
$(if $(filter
EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
- $(if $(gb_COLOR),-fdiagnostics-color=always) \
ifeq ($(HAVE_WDEPRECATED_COPY_DTOR),TRUE)
gb_CXXFLAGS_COMMON += -Wdeprecated-copy-dtor
