Skip to content

[lldb] Bump macOS versions to 11 on the TestPlaygrounds test #3675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

augusto2112
Copy link

@augusto2112 augusto2112 commented Dec 13, 2021

This is necessary since macOS 11 was the first version to support ARM64,
and the compiler will silently bump up the triple when something < 11 is
specified.

@augusto2112
Copy link
Author

@swift-ci test

@augusto2112 augusto2112 force-pushed the sidestep-wrong-triple-gen branch from b69fc7e to 9759e36 Compare December 13, 2021 18:45
@augusto2112
Copy link
Author

@swift-ci test

Copy link

@adrian-prantl adrian-prantl left a comment

Choose a reason for hiding this comment

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

That

@@ -17,7 +17,7 @@ let b = 5

a + b

@available(macOS 10.11, iOS 8.0, tvOS 8.0, watchOS 6.0, *) func newAPI() -> Int {
@available(macOS 11.11, iOS 8.0, tvOS 8.0, watchOS 6.0, *) func newAPI() -> Int {

Choose a reason for hiding this comment

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

11.0 there has not (yet?) been an 11.11 :-)

@@ -53,7 +53,7 @@ def get_build_triple(self):
version = '7.0'
triple = '{}-{}-{}{}'.format(arch, vendor, os, version)
else:
triple = '{}-apple-macosx10.10'.format(platform.machine())
triple = '{}-apple-macosx11.10'.format(platform.machine())

Choose a reason for hiding this comment

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

same here

This is necessary since macOS 11 was the first version to support ARM64,
and the compiler will silently bump up the triple when something < 11 is
specified.
@augusto2112 augusto2112 force-pushed the sidestep-wrong-triple-gen branch from 9759e36 to 97da26f Compare December 14, 2021 12:28
@augusto2112
Copy link
Author

@swift-ci test

Copy link

@adrian-prantl adrian-prantl left a comment

Choose a reason for hiding this comment

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

Looks good!

@JDevlieghere
Copy link

Thanks Augusto!

@augusto2112 augusto2112 merged commit 9103340 into swiftlang:stable/20210726 Dec 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants