config_host.mk.in | 1 - configure.ac | 1 - solenv/gbuild/platform/macosx.mk | 4 ---- 3 files changed, 6 deletions(-)
New commits: commit 70970f8b72eddc66693ec28d26c2dc764009d3e3 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Fri Nov 23 18:38:30 2018 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Fri Nov 23 23:38:14 2018 +0100 Revert "Do use -O1 for Apple Clang older than 9.1.0" This reverts commit 55b9706bea5aa9b654ab39bc7d56339422e17087, which is obsoleted by b4f666f2e677b05cab8395fe7972b45b15f60c3f "Bump Xcode baseline to 9.3". Change-Id: Id2240351ed9495e311d55887b8e34f2aa776ae06 Reviewed-on: https://gerrit.libreoffice.org/63896 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/config_host.mk.in b/config_host.mk.in index 9ed3802ad761..a095f430464b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -62,7 +62,6 @@ 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 cddfd825e4a3..ea2229e3324d 100644 --- a/configure.ac +++ b/configure.ac @@ -3667,7 +3667,6 @@ 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 b8f5335fca7f..d51ce5887956 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -19,10 +19,6 @@ 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits