diff --git a/wm/libAppleWM/Makefile b/wm/libAppleWM/Makefile
index 263d3ba36172..cdb867581a49 100644
--- a/wm/libAppleWM/Makefile
+++ b/wm/libAppleWM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/01/18 23:35:40 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/02/25 12:30:58 ryoon Exp $
 
 DISTNAME=	libAppleWM-1.4.1
 PKGREVISION=	1
@@ -21,10 +21,7 @@ USE_TOOLS+=		pkg-config
 CONFIGURE_ENV+=		LIB_MAN_SUFFIX=3
 PKGCONFIG_OVERRIDE+=	applewm.pc.in
 
-.if exists(/usr/bin/xcrun)
-MY_XCODE_SDK_PATH!=	/usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path
-.endif
-MAKE_ENV+=		OSX_SDK_PATH=${MY_XCODE_SDK_PATH}
+MAKE_ENV+=		OSX_SDK_PATH=${XCODE_SDK_PATH}
 
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/modular-xorg-xquartz/Makefile b/x11/modular-xorg-xquartz/Makefile
index 1401efef4654..15d1bbef09ad 100644
--- a/x11/modular-xorg-xquartz/Makefile
+++ b/x11/modular-xorg-xquartz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/05/22 10:56:48 adam Exp $
+# $NetBSD: Makefile,v 1.14 2021/02/25 12:30:58 ryoon Exp $
 
 DISTNAME=	xorg-server-1.17.2
 PKGNAME=	${DISTNAME:S/xorg-server/modular-xorg-xquartz/}
@@ -81,10 +81,7 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 .include "../../security/nettle/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-sha1=libnettle
 
-.if exists(/usr/bin/xcrun)
-MY_XCODE_SDK_PATH!=	/usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path
-MAKE_ENV+=		OSX_SDK_PATH=${MY_XCODE_SDK_PATH}
-.endif
+MAKE_ENV+=		OSX_SDK_PATH=${XCODE_SDK_PATH}
 
 MESSAGE_SUBST+=		PREFIX=${PREFIX}