Add support for 11.x SDKs (#251)

This commit is contained in:
Thomas Pöchtrager 2020-12-25 09:30:44 +01:00
parent 7c090bd8cd
commit 4287300a5c
2 changed files with 9 additions and 6 deletions

View File

@ -40,7 +40,8 @@ case $SDK_VERSION in
10.14*) TARGET=darwin18; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=0; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
10.15*) TARGET=darwin19; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=0; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
10.16*) TARGET=darwin20; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
11.0*) TARGET=darwin20; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
11.0*) TARGET=darwin20.1; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
11.1*) TARGET=darwin20.2; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;;
*) echo "Unsupported SDK"; exit 1 ;;
esac

View File

@ -71,12 +71,14 @@ OSVersion Target::getSDKOSNum() const {
if (target.size() < 7)
return OSVersion();
int n = atoi(target.c_str() + 6);
double n = atof(target.c_str() + 6);
if (n >= 20)
return OSVersion(11, n - 20);
else
return OSVersion(10, 4 + (n - 8));
if (n >= 20.0f) {
n = (((n - 20.0) * 10.0) - 1.0) + 0.1;
return OSVersion(11, (int)n);
} else {
return OSVersion(10, (int)n - 4);
}
}
}