diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-24 17:41:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-06 23:01:34 +0100 |
| commit | d7b46ef1cf69c9fe5c4c36958ca5d5b40de8cf8d (patch) | |
| tree | 21af0743d7f06165e43d52b4c29fb5cfba60d937 /solenv | |
| parent | 65b9c62354f77c0d3ff02dfa3151447c629ef419 (diff) | |
Remove obsolete GCC version checks
...after <https://gerrit.libreoffice.org/63951> "Bump (Linux) GCC baseline to
7.0.0". (In some cases, those checks now need to check for __clang__, which was
implicitly covered in the past by Clang consistently reporting to be
GCC 4.2.1.)
Change-Id: I860fef8c4ca41c22a7541f0fb2d34b37d1d69bed
Reviewed-on: https://gerrit.libreoffice.org/63952
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 4875759e06e2..1048a1375327 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -100,7 +100,9 @@ gb_CXXFLAGS_COMMON += -ffunction-sections -fdata-sections gb_LinkTarget_LDFLAGS += -Wl,--gc-sections endif -ifeq ($(shell expr '$(GCC_VERSION)' '>=' 600),1) +ifeq ($(COM_IS_CLANG),TRUE) +gb_CXXFLAGS_COMMON += -Wimplicit-fallthrough +else gb_CFLAGS_COMMON += \ -Wduplicated-cond \ -Wlogical-op \ @@ -119,16 +121,6 @@ gb_CXXFLAGS_COMMON += \ -Wno-cast-function-type endif -ifeq ($(COM_IS_CLANG),TRUE) -gb_CXXFLAGS_COMMON += -Wimplicit-fallthrough -else -# GCC 4.8, at least, is confused by boost 1.66 optional assignments -ifeq ($(shell expr '$(GCC_VERSION)' '<' 409),1) -gb_CXXFLAGS_COMMON += -Wno-maybe-uninitialized -endif -endif - - # If CC or CXX already include -fvisibility=hidden, don't duplicate it ifeq (,$(filter -fvisibility=hidden,$(CC))) gb_VISIBILITY_FLAGS := -fvisibility=hidden |