diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-17 13:46:42 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-17 13:46:42 +0000 |
| commit | 82708306d974e9f76a43f51ca64547d2da539e42 (patch) | |
| tree | 5a5775dbc9c3105004c7c7887e8793b10bcd3dc5 /set_soenv.in | |
| parent | 416d7a0fba60573e27ab2388ea4ce3a023b5e2d8 (diff) | |
CWS-TOOLING: integrate CWS configure24_DEV300
2009-03-06 10:31:03 +0100 rene r268982 : #i10000# more syntax
2009-03-06 09:55:08 +0100 rene r268978 : #i10000# syntax (thanks tinderbox)
2009-03-06 09:52:35 +0100 rene r268976 : #i99864# $JRETOOLKITDIR also need to be ifed
2009-03-05 18:22:24 +0100 rene r268935 : #i99864# readd support for lemote
2009-03-05 17:58:36 +0100 rene r268934 : fix description
2009-03-05 17:56:11 +0100 rene r268933 : CWS-TOOLING: rebase CWS configure24 to branches/OOO310@268862 (milestone: OOO310:m4)
2009-03-05 15:11:07 +0100 rene r268909 : #i10000# error out if libdb not valid
#i99924# force ICU 4.x
2009-03-04 14:15:16 +0100 rene r268825 : #i99864# OpenJDK has mipsel as path, same as gcj
2009-03-03 09:50:31 +0100 rene r268710 : #i10000# fix MIPS
2009-02-27 13:40:07 +0100 rene r268590 : #i99490# allow db 4.7
Diffstat (limited to 'set_soenv.in')
| -rw-r--r-- | set_soenv.in | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/set_soenv.in b/set_soenv.in index 77798fabe579..e2345306f525 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -548,12 +548,11 @@ elsif ( $platform =~ m/linux/ ) else { if ('@WORDS_BIGENDIAN@' ne 'yes') { $EPM_FLAGS = "-a mipsel"; - if ( $JDK eq "gcj" ) { - $ARCH = "mipsel"; - } - else { - $ARCH = "mips32"; - } + if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) { + $ARCH = "mips32"; # Lemote + } else { + $ARCH = "mipsel"; + } } else { $ARCH = "mips"; @@ -561,7 +560,11 @@ elsif ( $platform =~ m/linux/ ) } $JRELIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client"; + if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) { + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client"; # Lemote + } else { + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."server"; + } $JRETHREADDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads"; } |