summaryrefslogtreecommitdiff
path: root/solenv/inc/unx.mk
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:18:27 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:18:27 +0000
commit17a1aa24a95506932f2f09a7f6abb9e2285ca028 (patch)
tree69449b19fae83e6d68574947f04eee2583c528ef /solenv/inc/unx.mk
parent1bb92695da0873f1e4196a828e7a204978ffe28b (diff)
INTEGRATION: CWS hr51 (1.38.14); FILE MERGED
2008/05/14 14:47:51 hr 1.38.14.1: #i33126#: support for Solaris LP64
Diffstat (limited to 'solenv/inc/unx.mk')
-rw-r--r--solenv/inc/unx.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 36bdbcd45be1..61df0992a345 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: unx.mk,v $
#
-# $Revision: 1.38 $
+# $Revision: 1.39 $
#
# This file is part of OpenOffice.org.
#
@@ -63,6 +63,14 @@
.INCLUDE : unxsoli4.mk
.ENDIF
+.IF "$(OS)$(CPU)$(COMEX)" == "SOLARISU4"
+.INCLUDE : unxsolu4.mk
+.ENDIF
+
+.IF "$(OS)$(CPU)$(COMEX)" == "SOLARISX4"
+.INCLUDE : unxsolx4.mk
+.ENDIF
+
.IF "$(COM)$(OS)$(CPU)" == "GCCSOLARISS"
.INCLUDE : unxsogs.mk
.ENDIF