You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 01:11:22 UTC

svn commit: r1409594 - in /incubator/ooo/branches/gbuild/main: solenv/gbuild/platform/linux.mk sw/Library_vbaswobj.mk

Author: arist
Date: Thu Nov 15 00:11:22 2012
New Revision: 1409594

URL: http://svn.apache.org/viewvc?rev=1409594&view=rev
Log:
gnumake4_141_ad05b3eaeb22.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1303142355 0
# Node ID ad05b3eaeb226299abef2ffd5f361a778d8cacf7
# Parent  cbb7d7de56cc66bf08e02ffabe16aff3caf6e095
gnumake4: linux.mk: in product builds, link with -O1


Modified:
    incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
    incubator/ooo/branches/gbuild/main/sw/Library_vbaswobj.mk

Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk?rev=1409594&r1=1409593&r2=1409594&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk Thu Nov 15 00:11:22 2012
@@ -137,6 +137,10 @@ gb_LinkTarget_LDFLAGS += \
 
 endif
 
+ifeq ($(gb_DEBUGLEVEL),0)
+gb_LinkTarget_LDFLAGS += -Wl,-O1
+endif
+
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
 
 ifeq ($(gb_DEBUGLEVEL),2)

Modified: incubator/ooo/branches/gbuild/main/sw/Library_vbaswobj.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_vbaswobj.mk?rev=1409594&r1=1409593&r2=1409594&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_vbaswobj.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_vbaswobj.mk Thu Nov 15 00:11:22 2012
@@ -114,10 +114,4 @@ $(eval $(call gb_Library_add_exception_o
 	sw/source/ui/vba/wordvbahelper \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_ldflags,vbaswobj,\
-	-Wl$(COMMA)-O1 \
-))
-endif
-
 # vim: set noet sw=4 ts=4: