summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbootstrap/bootstrap6
-rw-r--r--pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk4
2 files changed, 7 insertions, 3 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 464d4523130..9b45398aece 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.292 2020/08/20 13:04:01 bacon Exp $
+# $NetBSD: bootstrap,v 1.293 2020/08/29 20:11:21 js Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
# All rights reserved.
@@ -754,6 +754,10 @@ QNX)
groupsprog="id -gn"
whoamiprog="id -un"
machine_arch=`uname -p | sed -e 's/x86/i386/'`
+ # libarchive checks for "rm -f" with no arguments being accepted. This
+ # does not work on QNX. Interestingly, libarchive doesn't seem to
+ # actually need it during the build.
+ export ACCEPT_INFERIOR_RM_PROGRAM=yes
;;
SCO_SV)
root_group=root
diff --git a/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk
index 3727ec874dc..eba1bba484f 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk
@@ -1,4 +1,4 @@
-# $NetBSD: QNX.sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
+# $NetBSD: QNX.sys.mk,v 1.3 2020/08/29 20:11:21 js Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix?= We run Unix
@@ -79,7 +79,7 @@ SHELL?= sh
SIZE?= size
-TSORT?= tsort -q
+TSORT?= cat
YACC?= yacc
YFLAGS?=