CVS commit: pkgsrc/mk/platform

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Nov  7 16:50:27 UTC 2018

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

Log Message:
If an SDK matching our OS X version isn't found -- for instance, because
OS X has been upgraded and Xcode hasn't been -- try again without
specifying the version. This (1) works better and (2) gives a better
error message when it doesn't. From Markus Mayer in PR pkg/50317.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/mk/platform/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/platform/Darwin.mk
diff -u pkgsrc/mk/platform/Darwin.mk:1.88 pkgsrc/mk/platform/Darwin.mk:1.89
--- pkgsrc/mk/platform/Darwin.mk:1.88   Tue Oct 10 13:57:23 2017
+++ pkgsrc/mk/platform/Darwin.mk        Wed Nov  7 16:50:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.88 2017/10/10 13:57:23 jperkin Exp $
+# $NetBSD: Darwin.mk,v 1.89 2018/11/07 16:50:27 schmonz Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -101,6 +101,9 @@ _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 --show-sdk-path 2>/dev/null || echo /nonexistent
+.    endif
 MAKEFLAGS+=    OSX_SDK_PATH=${OSX_SDK_PATH:Q}
 .  endif
 .  if exists(${OSX_SDK_PATH}/usr/include/stdio.h)