[Libreoffice-commits] .: solenv/gbuild

[Lubos Lunak]

 solenv/gbuild/LinkTarget.mk      |    2 +-
 solenv/gbuild/platform/unxgcc.mk |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e001ad5a8ee056bf2c545d5c0bbc09c143cd0949
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Apr 14 15:05:27 2011 +0200

    add -Wl,-O1 as linker optimization flags when debug is disabled

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index c0d2e84..5f0cdc5 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -391,7 +391,7 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
-$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $$(gb_LinkTarget_LDFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(gb_LINKEROPTFLAGS)
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := 
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := 
 $(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index b1eb050..11a0205 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -148,8 +148,10 @@ endif
 
 ifneq ($(gb_DEBUGLEVEL),0)
 gb_COMPILEROPTFLAGS := -O0
+gb_LINKEROPTFLAGS :=
 else
 gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
+gb_LINKEROPTFLAGS := -Wl,-O1
 endif
 
 gb_COMPILERNOOPTFLAGS := -O0