[Libreoffice-commits] .: icu/makefile.mk

[Caolán McNamara]

 icu/makefile.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7cb7efce3552563cba41bd9cb62c0ae82e60e154
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 12 13:57:42 2012 +0100

    make icu build on mips again
    
    my mips supports hash-style=both, but if you actually use it ld
    barfs with "gnu.hash is incompatible with the mips abi"
    
    everywhere else we just do -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
    
    Change-Id: Ie310b7edad0d3068e5c4fcfed22aaea96698a06b

diff --git a/icu/makefile.mk b/icu/makefile.mk
index f65481a..c529c99 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -106,7 +106,7 @@ LDFLAGSADD+=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
 .ENDIF                  # "$(OS)"=="AIX"
 
 .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
-LDFLAGSADD += -Wl,--hash-style=both
+LDFLAGSADD += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
 .ENDIF
 
 .IF "$(OS)"=="IOS"