[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - solenv/gbuild

[Richard PALO]

 solenv/gbuild/platform/solaris.mk |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit f081a415221bd8665cceebe91665e2253781b516
Author: Richard PALO <richard at NetBSD.org>
Date:   Fri Feb 13 19:17:54 2015 +0100

    Sun ld doesn't support -O1 optimize flag
    reported by Gabriele Bulfon (gbulfon at sonicle)
    
    Change-Id: Ie0ff8fe296054a7a266b4c73c30938bb2b7353ea
    Reviewed-on: https://gerrit.libreoffice.org/14484
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 34a167e1bf9b478069c290dbf977c68639149852)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 8256620..e4bc23b 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -131,11 +131,8 @@ gb_LinkTarget_LDFLAGS += \
 
 endif
 
-ifneq ($(gb_DEBUGLEVEL),0)
+# sun ld doesn't understand -O1 optimize flag
 gb_LINKEROPTFLAGS :=
-else
-gb_LINKEROPTFLAGS := -Wl,-O1
-endif
 
 ifeq ($(gb_SYMBOL),$(true))
 gb_LINKERSTRIPDEBUGFLAGS :=