summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-04-03 15:45:23 +0000
committerKurt Zenker <kz@openoffice.org>2008-04-03 15:45:23 +0000
commit3bc95259549ee27ce52b74773c6fecf176b6e831 (patch)
tree269fdfad5abc0361810202f940f11e1ede64c98e /solenv
parent9eac7365dccaa1e57e5a47fe92efae14fbabe876 (diff)
INTEGRATION: CWS s390xport01 (1.36.46); FILE MERGED
2008/03/26 12:56:09 cmc 1.36.46.1: #i87464# add support for s390x and merge sb's LINK changes into the other minor ports
Diffstat (limited to 'solenv')
-rw-r--r--solenv/inc/unx.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 0d094bed2089..48d6d3a0f334 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: unx.mk,v $
#
-# $Revision: 1.36 $
+# $Revision: 1.37 $
#
-# last change: $Author: obo $ $Date: 2008-02-27 09:45:38 $
+# last change: $Author: kz $ $Date: 2008-04-03 16:45:23 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -123,10 +123,14 @@
.INCLUDE : unxlngppc64.mk
.ENDIF
-.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUX32REDHAT60"
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUX32REDHAT60S390"
.INCLUDE : unxlngs3904.mk
.ENDIF
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUX32REDHAT60S390X"
+.INCLUDE : unxlngs390x.mk
+.ENDIF
+
.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXR2REDHAT60"
.INCLUDE : unxlngr.mk
.ENDIF