From 0a89b87a3ff329c7cd9e3b6c605cef0312c9ed61 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 18 Nov 2021 15:40:36 -0700 Subject: [PATCH] mkpkg: handle a macOS SDK that just uses the major version. For example, MacOSX11.sdk instead of MacOSX11.3.sdk. --- scripts/mkpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mkpkg b/scripts/mkpkg index ca28de1e8..9f9a92f12 100755 --- a/scripts/mkpkg +++ b/scripts/mkpkg @@ -347,7 +347,7 @@ case "$osversion" in ;; esac if test "${osversion}" != "`$scriptdir/pp --probe`"; then - sdkvers=`echo "${osversion}" | sed 's/^macos\([0-9][0-9]\)\([0-9]*\)-.*$/\1.\2/'` + sdkvers=`echo "${osversion}" | sed -e 's/^macos\([0-9][0-9]\)\([0-9]*\)-.*$/\1.\2/' -e 's/\.$//'` # SDKs may be under Xcode.app or CommandLineTools (for non-Xcode) if [ -d "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs" ]; then SDK_DIR="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs"