From 2cfa045f7ca2b09cf4bc5ff8e839584ee0913429 Mon Sep 17 00:00:00 2001 From: nia Date: Fri, 12 Nov 2021 20:29:05 +0000 Subject: mk/bootstrap: Fix bits for SCO UnixWare 7. Derived from a patch from Boyd Lynn Gerber. --- bootstrap/bootstrap | 3 ++- mk/bsd.prefs.mk | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 9cb356139ab..9b0b1a92f6c 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.302 2021/07/13 12:43:58 schmonz Exp $ +# $NetBSD: bootstrap,v 1.303 2021/11/12 20:29:05 nia Exp $ # # Copyright (c) 2001-2011 Alistair Crooks # All rights reserved. @@ -835,6 +835,7 @@ UnixWare) need_awk=yes need_sed=yes whoamiprog=/usr/ucb/whoami + machine_arch=`uname -m` CC="gcc -DUNIXWARE"; export CC ;; *) diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index dddd8cfebd4..a7d18299e46 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.410 2021/11/02 08:14:58 nia Exp $ +# $NetBSD: bsd.prefs.mk,v 1.411 2021/11/12 20:29:05 nia Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -285,6 +285,12 @@ OS_VARIANT= SCOOSR5 OS_VARIANT= SCOOSR6 . endif +.elif ${OPSYS} == "UnixWare" +SCO_RELEASE?= sysv5${OPSYS} +SCO_VERSION!= ${UNAME} -v +LOWER_VENDOR?= unknown +LOWER_OPSYS_VERSUFFIX= ${SCO_RELEASE}${SCO_VERSION} + .elif ${OPSYS} == "Minix" LOWER_VENDOR?= unknown LOWER_OPSYS:= ${OPSYS:tl} @@ -362,6 +368,8 @@ OBJECT_FMT= SOM OBJECT_FMT= PE .elif ${OPSYS} == "SCO_SV" OBJECT_FMT= ELF +.elif ${OPSYS} == "UnixWare" +OBJECT_FMT= ELF .endif # Calculate depth -- cgit v1.2.3