diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:04:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:04:47 +0000 |
| commit | af88a885292267d650360d85366223528f72f9b9 (patch) | |
| tree | d4d1a4e2a46acbddeb56152c554274049cdd1430 /icu | |
| parent | 3906a67cf0683e33ff01079cc8f758217bdbe37e (diff) | |
INTEGRATION: CWS configure21 (1.35.4); FILE MERGED
2007/07/09 23:22:39 rene 1.35.4.3: #i10000# both also here
2007/06/27 15:05:56 rene 1.35.4.2: RESYNC: (1.35-1.36); FILE MERGED
2007/05/06 16:08:51 rene 1.35.4.1: support --hash-style= from binutils
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 48225cab020a..06a3a863cebf 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.36 $ +# $Revision: 1.37 $ # -# last change: $Author: vg $ $Date: 2007-05-25 11:06:34 $ +# last change: $Author: hr $ $Date: 2007-07-31 13:04:47 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -85,6 +85,10 @@ icu_CXXFLAGS+=-O $(ARCH_FLAGS) DISABLE_64BIT=--enable-64bit-libs=no .ENDIF # "$(OS)"=="SOLARIS" +.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" +LDFLAGSADD += -Wl,--hash-style=both +.ENDIF + CONFIGURE_DIR=source CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)' |