[pkgsrc/trunk]: pkgsrc/mk/platform Add OSX_TOLERATE_SDK_SKEW to control wheth...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/966778ad29b9
branches:  trunk
changeset: 314789:966778ad29b9
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Nov 08 22:18:14 2018 +0000

description:
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:

 mk/platform/Darwin.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (26 lines):

diff -r 3d5d552738b9 -r 966778ad29b9 mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Thu Nov 08 20:58:17 2018 +0000
+++ b/mk/platform/Darwin.mk     Thu Nov 08 22:18:14 2018 +0000
@@ -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 @@
 #
 # 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}