CVS commit: pkgsrc/shells/standalone-tcsh

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar  3 07:30:47 UTC 2022

Modified Files:
        pkgsrc/shells/standalone-tcsh: Makefile

Log Message:
standalone-tcsh: Don't hardcode our own list of archs on which to disable
static PIE.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/shells/standalone-tcsh/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/standalone-tcsh/Makefile
diff -u pkgsrc/shells/standalone-tcsh/Makefile:1.40 pkgsrc/shells/standalone-tcsh/Makefile:1.41
--- pkgsrc/shells/standalone-tcsh/Makefile:1.40 Thu Mar  3 03:33:47 2022
+++ pkgsrc/shells/standalone-tcsh/Makefile      Thu Mar  3 07:30:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2022/03/03 03:33:47 mrg Exp $
+# $NetBSD: Makefile,v 1.41 2022/03/03 07:30:47 nia Exp $
 #
 
 # FIXME: This is because of PREFIX=/ below.
@@ -16,14 +16,12 @@ DESCR_SRC=          ../../shells/tcsh/DESCR DESC
 # anyone wants.
 ONLY_FOR_PLATFORM+=    NetBSD-*-* OpenBSD-*-* SunOS-*-*
 
-.if "${OPSYS}" == "NetBSD" && \
-    (${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "aarch64eb" || \
-     ${MACHINE_ARCH} == "mipsn64-el" || ${MACHINE_ARCH} == "mipsn64eb")
+.include "../../mk/bsd.prefs.mk"
+
+.if "${OPSYS}" == "NetBSD" && !defined(OPSYS_HAS_STATIC_PIE)
 MKPIE_SUPPORTED= no
 .endif
 
-.include "../../mk/bsd.prefs.mk"
-
 .if ${OS_VARIANT} == "OmniOS"
 NOT_FOR_PLATFORM+=     SunOS-*-*
 .endif