[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Tor Lillqvist]

 config_host.mk.in                |    1 +
 configure.ac                     |    1 +
 solenv/gbuild/platform/macosx.mk |    4 ++++
 3 files changed, 6 insertions(+)

New commits:
commit 55b9706bea5aa9b654ab39bc7d56339422e17087
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 17 23:04:37 2018 +0300

    Do use -O1 for Apple Clang older than 9.1.0
    
    Don't want to risk breaking something by using -O2 with an older
    Clang, even if I don't remember exactly what the issue was when
    introducing the -O1 in 7b660e1423554928350e1de2cd4cb7eb577a27ec.
    
    Change-Id: I2adeb0e8eb85a9b5021fca3d9e1e703cb5604a81
    Reviewed-on: https://gerrit.libreoffice.org/53068
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index 965cdaf6887a..8f9fb90c98e7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -62,6 +62,7 @@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
 @x_CFLAGS@ export CFLAGS=@CFLAGS@
 export CLANGDIR=@CLANGDIR@
 export CLANGLIBDIR=@CLANGLIBDIR@
+export CLANGVER=@CLANGVER@
 export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
 export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
 export LIBCMIS_CFLAGS=$(gb_SPACE)@LIBCMIS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index dbd524126005..717e7c1e3d4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3635,6 +3635,7 @@ if test "$COM_IS_CLANG" = TRUE; then
     AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
 fi
 AC_SUBST(COM_IS_CLANG)
+AC_SUBST(CLANGVER)
 
 SHOWINCLUDES_PREFIX=
 if test "$_os" = WINNT; then
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 37ff092ef4cb..be107371f123 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -22,6 +22,10 @@ export VCL_HIDE_WINDOWS=1
 
 gb_SDKDIR := $(MACOSX_SDK_PATH)
 
+ifeq (PRE_9_1_0,$(shell test $(CLANGVER) -lt 90100 && echo PRE_9_1_0))
+gb_COMPILEROPTFLAGS := -O1
+endif
+
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
 # Darwin mktemp -t expects a prefix, not a pattern