Author: jim
Date: Mon Nov 27 17:00:12 2017
New Revision: 1816476
URL: http://svn.apache.org/viewvc?rev=1816476&view=rev
Log:
Generalized opt fix by Don Lewis for clang-based platforms
BUGZ 126622
Modified:
openoffice/branches/AOO415/main/framework/Library_fwk.mk
Modified: openoffice/branches/AOO415/main/framework/Library_fwk.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO415/main/framework/Library_fwk.mk?rev=1816476&r1=1816475&r2=1816476&view=diff
==============================================================================
--- openoffice/branches/AOO415/main/framework/Library_fwk.mk (original)
+++ openoffice/branches/AOO415/main/framework/Library_fwk.mk Mon Nov 27
17:00:12 2017
@@ -57,10 +57,6 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-ifeq ($(OS),MACOSX)
-gb_COMPILEROPTFLAGS := -O1
-endif
-
$(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/accelerators/acceleratorcache \
framework/source/accelerators/acceleratorconfiguration \
@@ -190,4 +186,12 @@ $(eval $(call gb_Library_add_exception_o
framework/source/xml/imagesdocumenthandler \
))
+# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
+# Also affects FreeBSD 10.3 with clang 3.4.1.
+# Appears to be a clang optimization bug in versions less than 3.8.0
+ifeq ($(COM)$(CPUNAME),CLANGX86_64)
+ $(call gb_CxxObject_get_target,framework/source/loadenv/loadenv):\
+ CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS)
$(gb_COMPILERNOOPTFLAGS)
+endif
+
# vim: set noet sw=4 ts=4:
