CVS commit: pkgsrc/mk/tools

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sat Oct 10 09:31:50 UTC 2020

Modified Files:
        pkgsrc/mk/tools: tools.Darwin.mk

Log Message:
mk: Stop using XCode binaries on Big Sur.

These no longer support being executed via a symlink, failing with errors
such as:

  xcode-select: Failed to locate 'gmake', and no install could be requested

This breaks the entire .tools/bin directory, so we just have to avoid them
and use tools from pkgsrc instead.

It's likely a lot more will need to be added to this list, but this is
enough to get devel/cmake building at least.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/mk/tools/tools.Darwin.mk

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

Modified files:

Index: pkgsrc/mk/tools/tools.Darwin.mk
diff -u pkgsrc/mk/tools/tools.Darwin.mk:1.59 pkgsrc/mk/tools/tools.Darwin.mk:1.60
--- pkgsrc/mk/tools/tools.Darwin.mk:1.59        Wed Oct 17 08:30:43 2018
+++ pkgsrc/mk/tools/tools.Darwin.mk     Sat Oct 10 09:31:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.59 2018/10/17 08:30:43 jperkin Exp $
+# $NetBSD: tools.Darwin.mk,v 1.60 2020/10/10 09:31:50 jperkin Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -48,7 +48,11 @@ TOOLS_PLATFORM.ftp?=         /usr/bin/ftp
 TOOLS_PLATFORM.gerep?=         /usr/bin/egrep
 TOOLS_PLATFORM.gfrep?=         /usr/bin/fgrep
 TOOLS_PLATFORM.ggrep?=         /usr/bin/grep
-.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
+#
+# Big Sur does not support running XCode programs through a symlink, which
+# breaks the .tools/bin directory.
+#
+.if ${OS_VERSION:R} > 9 && ${OS_VERSION:R} < 20
 TOOLS_PLATFORM.gmake?=         /usr/bin/gnumake
 TOOLS_PLATFORM.gm4?=           /usr/bin/gm4
 .endif