Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.

account for macos 11 too when looking for mac sdks #393

Merged
xster merged 1 commit into from
Aug 15, 2020
Merged

account for macos 11 too when looking for mac sdks #393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/mac/find_sdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def main():
sdk_dir = xcode43_sdk_path
else:
sdk_dir = os.path.join(out.rstrip(), 'SDKs')
sdks = [re.findall('^MacOSX(10\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)]
sdks = [re.findall('^MacOSX(1[0|1]\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)]
Copy link
Member

@jmagman jmagman Aug 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it MacOSX10.16.sdk?

Copy link
Member Author

@xster xster Aug 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, we're going for 11 next https://en.wikipedia.org/wiki/MacOS_Big_Sur :D

Copy link
Member

@jmagman jmagman Aug 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But the SDK is 10.16 https://appleinsider.com/inside/macos-10.16

drwxr-xr-x  5 magder  primarygroup  160 Jun 29 16:01 DriverKit20.0.sdk
drwxr-xr-x  7 magder  primarygroup  224 Jun 29 16:01 MacOSX.sdk
lrwxr-xr-x  1 magder  primarygroup   10 Jul  8 13:45 MacOSX10.16.sdk -> MacOSX.sdk

Copy link
Member Author

@xster xster Aug 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

huh, interesting. There's some nuanced stuff going on... I'm getting

ll /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/                                                                                                                
total 0
drwxr-xr-x  5 xster  staff   160B Jul 30 05:11 DriverKit20.0.sdk/
drwxr-xr-x  7 xster  staff   224B Jul 30 05:11 MacOSX.sdk/
lrwxr-xr-x  1 xster  staff    10B Aug 11 13:11 MacOSX11.0.sdk@ -> MacOSX.sdk

Which beta version you on? I'm on 4

Copy link
Member Author

@xster xster Aug 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't find any other discussions about this... https://developer.apple.com/documentation/xcode-release-notes/xcode-12-beta-release-notes says Xcode 12 beta 4 includes SDKs for iOS 14, iPadOS 14, tvOS 14, watchOS 7, and macOS 11 and nothing for beta 3. But macOS 11 here could also just be referencing the marketing term...

Would love to see what you get on Xcode 12 beta 4. I'm assuming you're not currently since Jul 8 is a bit older.

Copy link
Member

@jmagman jmagman Aug 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was on beta 2. You're right, it's MacOSX11.0.sdk on beta 4!

Copy link
Member Author

@xster xster Aug 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah cool, good to know. Either way, this should handle 10.16 or 11.0.

Copy link
Member

@jmagman jmagman Aug 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we uses ^MacOSX\d+.*\.sdk$ so we don't need to do this again next year? It looks like it's trying to not match MacOSX.sdk

Copy link
Member Author

@xster xster Aug 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be conservative. I think it's not a bad thing for someone to come back and potentially touch this file again in case macos does decide to keep going up a major version every year.

sdks = [s[0] for s in sdks if s] # [['10.5'], ['10.6']] => ['10.5', '10.6']
sdks = [s for s in sdks # ['10.5', '10.6'] => ['10.6']
if parse_version(s) >= parse_version(min_sdk_version)]
Expand Down