diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-23 05:31:31 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-23 05:31:31 +0000 |
| commit | 1db02e20f7bbf84a648d495e7b61463a205d3e6d (patch) | |
| tree | 68d829c04f46ef5fecfeadb51bef802dd1ca0536 /icu | |
| parent | dfe0ccca2c129ce3716a14728798f344ae44635d (diff) | |
INTEGRATION: CWS ause072 (1.31.6); FILE MERGED
2007/01/15 14:49:41 hjs 1.31.6.2: #i72645# typo
2007/01/10 10:22:21 hjs 1.31.6.1: #i72645# disable 64bit for solaris only
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 34f674c9762a..cd12d6161846 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.31 $ +# $Revision: 1.32 $ # -# last change: $Author: kz $ $Date: 2006-12-12 15:51:25 $ +# last change: $Author: obo $ $Date: 2007-01-23 06:31:31 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -75,9 +75,14 @@ icu_LDFLAGS+=-L$(SYSBASE)$/usr$/lib icu_CFLAGS+=-O $(ARCH_FLAGS) icu_CXXFLAGS+=-O $(ARCH_FLAGS) +# until someone introduces SOLARIS 64-bit builds +.IF "$(OS)"=="SOLARIS" +DISABLE_64BIT=--enable-64bit-libs=no +.ENDIF # "$(OS)"=="SOLARIS" + CONFIGURE_DIR=source -CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' +CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)' #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no CONFIGURE_FLAGS= |