diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-02-17 17:18:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-02-20 19:25:25 +0000 |
| commit | 9a23239b710e44754e4a28643420c9ba91552645 (patch) | |
| tree | cbf2e6ec1dfbcdb41ea26cc46eb8486e8db15f6c | |
| parent | bd0a5bc4296b49da817151654b3fcc850403c614 (diff) | |
external/cppunit: Don't mis-apply GCC < 4.6 workaround for Clang
...which happens to define __GNUC__=4, __GNUC_MINOR__=2
Change-Id: I128547d0bd375ffec9deb6abd744eeb2667ba666
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147257
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | external/cppunit/UnpackedTarball_cppunit.mk | 1 | ||||
| -rw-r--r-- | external/cppunit/clang.patch.0 | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk index 4275c692e85e..d6304a96762e 100644 --- a/external/cppunit/UnpackedTarball_cppunit.mk +++ b/external/cppunit/UnpackedTarball_cppunit.mk @@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ external/cppunit/windows-arm64.patch.1 \ external/cppunit/propagate-exceptions.patch.0 \ external/cppunit/sprintf.patch.0 \ + external/cppunit/clang.patch.0 \ )) ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ diff --git a/external/cppunit/clang.patch.0 b/external/cppunit/clang.patch.0 new file mode 100644 index 000000000000..7a520f27616d --- /dev/null +++ b/external/cppunit/clang.patch.0 @@ -0,0 +1,11 @@ +--- include/cppunit/TestAssert.h ++++ include/cppunit/TestAssert.h +@@ -11,7 +11,7 @@ + + // Work around "passing 'T' chooses 'int' over 'unsigned int'" warnings when T + // is an enum type: +-#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)) ++#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)) && !defined __clang__ + #pragma GCC system_header + #endif + |