CVS commit: pkgsrc/mk/platform

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan 17 15:32:17 UTC 2017

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

Log Message:
Cache and use computed variables.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 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.85 pkgsrc/mk/platform/Darwin.mk:1.86
--- pkgsrc/mk/platform/Darwin.mk:1.85   Sun Nov 13 11:06:40 2016
+++ pkgsrc/mk/platform/Darwin.mk        Tue Jan 17 15:32:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.85 2016/11/13 11:06:40 jdolecek Exp $
+# $NetBSD: Darwin.mk,v 1.86 2017/01/17 15:32:17 jperkin Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -81,11 +81,13 @@ _OPSYS_EMULDIR.darwin=      # empty
 _OPSYS_SYSTEM_RPATH?=  /usr/lib
 _OPSYS_LIB_DIRS?=      /usr/lib
 
+.if !defined(OSX_VERSION)
 OSX_VERSION!=          sw_vers -productVersion
 .  if ${OSX_VERSION:R:R} != ${OSX_VERSION:R}
 OSX_VERSION:=          ${OSX_VERSION:R}
 .  endif
 MAKEFLAGS+=            OSX_VERSION=${OSX_VERSION:Q}
+.endif
 
 #
 # From Xcode 5 onwards system headers are no longer installed by default
@@ -97,10 +99,12 @@ MAKEFLAGS+=         OSX_VERSION=${OSX_VERSION:Q
 .if exists(/usr/include/stdio.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
+MAKEFLAGS+=    OSX_SDK_PATH=${OSX_SDK_PATH:Q}
+.  endif
 .  if exists(${OSX_SDK_PATH}/usr/include/stdio.h)
 _OPSYS_INCLUDE_DIRS?=  ${OSX_SDK_PATH}/usr/include
-MAKEFLAGS+=            OSX_SDK_PATH=${OSX_SDK_PATH:Q}
 .  else
 PKG_FAIL_REASON+=      "No suitable Xcode SDK or Command Line Tools installed."
 .  endif