From 706cab536b7c57d945578e6212e501feeac96e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Fri, 17 Jun 2005 13:13:12 +0000
Subject: [PATCH] INTEGRATION: CWS nativefixer10 (1.6.26); FILE MERGED
 2005/06/13 13:43:57 obr 1.6.26.1: #123452# teach user install scripts to
 install patches as well

---
 setup_native/scripts/source/makefile.mk | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/setup_native/scripts/source/makefile.mk b/setup_native/scripts/source/makefile.mk
index 6d4cea56ff00..50e14cc225d6 100644
--- a/setup_native/scripts/source/makefile.mk
+++ b/setup_native/scripts/source/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: kz $ $Date: 2005-03-04 15:24:54 $
+#   last change: $Author: rt $ $Date: 2005-06-17 14:13:12 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -63,9 +63,12 @@
 PRJ=..$/..
 
 PRJNAME=setup_native
-LIBTARGET=NO
 TARGET=getuid
 
+NO_DEFAULT_STL=TRUE
+LIBSALCPPRT=$(0)
+LIBTARGET=NO
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
@@ -92,6 +95,16 @@ CFLAGS+=-D_KERNEL
 .ENDIF
 .ENDIF
 
+# this object must not be a Ultra SPARC binary, this does not
+# work with /usr/bin/sort and such.
+.IF "$(OS)" == "SOLARIS"
+.IF "$(CPU)" == "S"
+.IF "$(COM)" != "GCC"
+ENVCFLAGS=-xarch=v8
+.ENDIF
+.ENDIF
+.ENDIF
+
 SLOFILES = $(SLO)$/getuid.obj
 
 SHL1OBJS=$(SLOFILES)