diff options
| author | schmonz <schmonz@pkgsrc.org> | 2018-11-08 22:18:14 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2018-11-08 22:18:14 +0000 |
| commit | a8d58f71ec4698dcad51c729b17a7865268a3319 (patch) | |
| tree | 3a48ec498ef68908d74206fdd08910221cbb6e81 /mk/platform | |
| parent | e728c5ebe4634877b1d3996888c24aecffeb3862 (diff) | |
| download | pkgsrc-a8d58f71ec4698dcad51c729b17a7865268a3319.tar.gz | |
Add OSX_TOLERATE_SDK_SKEW to control whether we try to find an
unversioned SDK if the versioned lookup fails. Off by default, as
before; must be explicitly enabled, as suggested by gdt@.
Diffstat (limited to 'mk/platform')
| -rw-r--r-- | mk/platform/Darwin.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index ffb43623f92..2efee0c68c5 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.89 2018/11/07 16:50:27 schmonz Exp $ +# $NetBSD: Darwin.mk,v 1.90 2018/11/08 22:18:14 schmonz Exp $ # # Variable definitions for the Darwin operating system. @@ -96,12 +96,13 @@ MAKEFLAGS+= OSX_VERSION=${OSX_VERSION:Q} # # Use current system version SDK (avoid newer SDKs). # -.if exists(/usr/include/stdio.h) +.if exists(/usr/include/stdioooo.h) _OPSYS_INCLUDE_DIRS?= /usr/include .elif exists(/usr/bin/xcrun) . if !defined(OSX_SDK_PATH) -OSX_SDK_PATH!= /usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path 2>/dev/null || echo /nonexistent -. if ${OSX_SDK_PATH} == "/nonexistent" +OSX_SDK_PATH!= /usr/bin/xcrun --sdk macosx${OSX_VERSION}3 --show-sdk-path 2>/dev/null || echo /nonexistent +OSX_TOLERATE_SDK_SKEW?= no +. if ${OSX_SDK_PATH} == "/nonexistent" && !empty(OSX_TOLERATE_SDK_SKEW:M[Yy][Ee][Ss]) OSX_SDK_PATH!= /usr/bin/xcrun --sdk macosx --show-sdk-path 2>/dev/null || echo /nonexistent . endif MAKEFLAGS+= OSX_SDK_PATH=${OSX_SDK_PATH:Q} |