From 59830fcd903be9be2b890be73390d604fac94aef Mon Sep 17 00:00:00 2001 From: Joe Garcia <joe.garcia@ssec.wisc.edu> Date: Mon, 22 Mar 2021 10:12:15 -0500 Subject: [PATCH] add sdk version based on derivative darwin version, since sdk versions might differ now (11.0, 11.1, 11.*, or 11 are all the same, really) --- ShellB3/shallbethree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh index ac0c02a7..e7483582 100755 --- a/ShellB3/shallbethree.sh +++ b/ShellB3/shallbethree.sh @@ -11182,7 +11182,7 @@ load_archive_tags() { _check_build_env if isDarwin ; then export SYSLIB=${MACOSX_DEPLOYMENT_TARGET} PLAT=Darwin-${CPUTYPE} - if [ "${MACOSX_DEPLOYMENT_TARGET}" != "${MACOSX_SDK_VERSION}" ] ; then + if [ "$( macVersionToDarwinVersion ${MACOSX_DEPLOYMENT_TARGET} )" != "$( macVersionToDarwinVersion ${MACOSX_SDK_VERSION} )" ] ; then export SYSLIB="${SYSLIB}-${MACOSX_SDK_VERSION}sdk" fi elif isLinux ; then -- GitLab