From 3d670ebbde0ef1f8f452f87df39a09d2aed7ff7c Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 12 Oct 2015 17:51:02 +0000 Subject: Don't rely on Darwin.mk setting OSX_SDK_PATH. It's an internal variable that will not always get defined. Instead query xcrun directly. --- wm/libAppleWM/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'wm') diff --git a/wm/libAppleWM/Makefile b/wm/libAppleWM/Makefile index 1609cdfd2d5..db1f6eccb23 100644 --- a/wm/libAppleWM/Makefile +++ b/wm/libAppleWM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2015/10/01 11:03:07 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2015/10/12 17:51:02 tnn Exp $ DISTNAME= libAppleWM-1.4.1 CATEGORIES= x11 devel @@ -20,7 +20,11 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 PKGCONFIG_OVERRIDE+= applewm.pc.in -MAKE_ENV+= OSX_SDK_PATH=${OSX_SDK_PATH} +.if exists(/usr/bin/xcrun) && exists(/usr/bin/sw_vers) +MY_OSX_VERS!= /usr/bin/sw_vers -productVersion +MY_XCODE_SDK_PATH!= /usr/bin/xcrun --sdk macosx${MY_OSX_VERS} --show-sdk-path +.endif +MAKE_ENV+= OSX_SDK_PATH=${MY_XCODE_SDK_PATH} .include "../../wm/applewmproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -- cgit v1.2.3