summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2018-11-07 16:50:27 +0000
committerschmonz <schmonz@pkgsrc.org>2018-11-07 16:50:27 +0000
commit505bf68846c686d21f1a318dcbdedef989d90777 (patch)
treefa31561f4dd4e60860bb6d8f84b568b52100aa01
parent11bce9c163198f74556fb950e153ede559602fd5 (diff)
downloadpkgsrc-505bf68846c686d21f1a318dcbdedef989d90777.tar.gz
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.
-rw-r--r--mk/platform/Darwin.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 72261c8360f..ffb43623f92 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -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)