diff options
| author | jperkin <jperkin@pkgsrc.org> | 2020-10-10 09:31:50 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2020-10-10 09:31:50 +0000 |
| commit | fa9ec32efac67fc680ece7cd50d78b8bfbaae2e3 (patch) | |
| tree | 32d08a2335fb40ff5689b09e1095cf90a45844c1 /mk | |
| parent | e434854d3588f52ecad602ca330b7fec5b6df11f (diff) | |
| download | pkgsrc-fa9ec32efac67fc680ece7cd50d78b8bfbaae2e3.tar.gz | |
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.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/tools.Darwin.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk index 067659c3af5..25851f390db 100644 --- a/mk/tools/tools.Darwin.mk +++ b/mk/tools/tools.Darwin.mk @@ -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 |