Skip to content

[CMake] set OSX_ARCHITECTURES in add_swift_target_library_single #59922

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

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented Jul 6, 2022

This way we configure correctly libBlocksRuntime, which is not using
add_swift_target_library (where the code for setting OSX_ARCHITECTURES
currently lives, see #38415 and #38956)

Addresses rdar://96469791

This way we configure correctly `libBlocksRuntime`, which is not using
`add_swift_target_library` (where the code for setting `OSX_ARCHITECTURES`
currently lives, see swiftlang#38415 and swiftlang#38956)

Addresses rdar://96469791
@edymtt
Copy link
Contributor Author

edymtt commented Jul 6, 2022

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented Jul 6, 2022

@swift-ci please build toolchain

@edymtt
Copy link
Contributor Author

edymtt commented Jul 6, 2022

preset=stdlib_S_standalone_minimal_macho_x86_64,build,test
@swift-ci please test with toolchain and preset

# CMAKE_OSX_ARCHITECTURES to ensure that CMake would
# not add the -arch flag
# This is no longer the case when running on Apple Silicon,
# when CMake will enforce a default (see
Copy link
Member

Choose a reason for hiding this comment

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

Can you please reflow the text here?

Copy link
Contributor Author

@edymtt edymtt Jul 6, 2022

Choose a reason for hiding this comment

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

Had a stab at this in 29e2b18 -- is this looking better?

@edymtt
Copy link
Contributor Author

edymtt commented Jul 6, 2022

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented Jul 6, 2022

@swift-ci please build toolchain

@edymtt
Copy link
Contributor Author

edymtt commented Jul 6, 2022

preset=stdlib_S_standalone_minimal_macho_x86_64,build,test
@swift-ci please test with toolchain and preset

@edymtt
Copy link
Contributor Author

edymtt commented Jul 6, 2022

@swift-ci please build toolchain Linux

@edymtt edymtt requested a review from compnerd July 7, 2022 15:50
@edymtt
Copy link
Contributor Author

edymtt commented Jul 7, 2022

Noticed in my first iteration I altered the semantics of the logic in a misguided effort to fit this into the existing conditions -- addressed this with d03731b

@edymtt
Copy link
Contributor Author

edymtt commented Jul 7, 2022

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented Jul 7, 2022

@swift-ci please build toolchain

@edymtt
Copy link
Contributor Author

edymtt commented Jul 7, 2022

preset=stdlib_S_standalone_minimal_macho_x86_64,build,test
@swift-ci please test with toolchain and preset

@edymtt
Copy link
Contributor Author

edymtt commented Jul 7, 2022

@swift-ci please test Apple Silicon

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Thanks! I can't believe we didn't notice this earlier.

@edymtt edymtt merged commit 20b00dd into swiftlang:main Jul 8, 2022
@edymtt edymtt deleted the set_osx_architectures_in_add_swift_target_library_single branch July 8, 2022 22:13
hborla pushed a commit to hborla/swift that referenced this pull request Jul 21, 2022
…wiftlang#59922)

This way we configure correctly `libBlocksRuntime`, which is not using
`add_swift_target_library` (where the code for setting `OSX_ARCHITECTURES`
currently lives, see swiftlang#38415 and swiftlang#38956)

Addresses rdar://96469791
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