This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new ac5edd0 Only ignore errors with Xcode12 (and later) versions of clang
ac5edd0 is described below
commit ac5edd08c7c24ca6bc3182a68da50631e0f85cf9
Author: Jim Jagielski <[email protected]>
AuthorDate: Thu Dec 3 13:49:26 2020 -0500
Only ignore errors with Xcode12 (and later) versions of clang
---
ext_libraries/apr/makefile.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ext_libraries/apr/makefile.mk b/ext_libraries/apr/makefile.mk
index 0f29c60..ea007d9 100644
--- a/ext_libraries/apr/makefile.mk
+++ b/ext_libraries/apr/makefile.mk
@@ -62,10 +62,10 @@ BUILD_ACTION=INCLUDE="$(INCLUDE);./include" USEMAK=1 nmake
-f Makefile.win buil
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure --prefix=$(OUTDIR)
--includedir=$(OUTDIR)$/inc$/apr
-# Recent versions of clang on macOS break some tests in APR 1.6 (and older)
+# Recent versions of clang (clang-12xxx) on macOS break some tests in APR 1.6
(and older)
# configure (mostly around testing sizeof) due to errors now being fatal.
-# Work around this by ignoring all errors
-.IF "$(OS)"=="MACOSX"
+# Work around this by ignoring all errors but only with the later versions of
Xcode
+.IF "$(OS)"=="MACOSX" && "$(COM)"=="CLANG" && "$(CCNUMVER)" > "001100000003"
CONFIGURE_FLAGS=CPPFLAGS="-Wno-error=all"
.ELSE
CONFIGURE_FLAGS=
