Skip to content

[embedded] Pass all default stdlib SWIFT_COMPILE_FLAGS to the embedded stdlib build too #69072

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
merged 1 commit into from
Oct 9, 2023

Conversation

kubamracek
Copy link
Contributor

This resolves a problem that currently the macOS toolchain CI job is excluding the embedded Swift.swiftmodule from the nightly toolchain because recursive lipo doesn't expect the x86-compiler-produced .swiftmodule and arm64-compiler-produced .swiftmodule to differ, but they do (because they embed file paths because of a missing -enable-experimental-concise-pound-file flag):

-- Warning: non-executable source files are different, skipping:
./macosx-arm64/Applications/Xcode.app/Contents/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-10-08-a.xctoolchain/usr/lib/swift/embedded/Swift.swiftmodule/armv7-apple-none-macho.swiftmodule
./macosx-x86_64/Applications/Xcode.app/Contents/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-10-08-a.xctoolchain/usr/lib/swift/embedded/Swift.swiftmodule/armv7-apple-none-macho.swiftmodule
-- Warning: non-executable source files are different, skipping:
./macosx-arm64/Applications/Xcode.app/Contents/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-10-08-a.xctoolchain/usr/lib/swift/embedded/Swift.swiftmodule/arm64-apple-macos.swiftmodule
./macosx-x86_64/Applications/Xcode.app/Contents/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-10-08-a.xctoolchain/usr/lib/swift/embedded/Swift.swiftmodule/arm64-apple-macos.swiftmodule
-- Warning: non-executable source files are different, skipping:
./macosx-arm64/Applications/Xcode.app/Contents/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-10-08-a.xctoolchain/usr/lib/swift/embedded/Swift.swiftmodule/arm64-apple-none-macho.swiftmodule
./macosx-x86_64/Applications/Xcode.app/Contents/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-10-08-a.xctoolchain/usr/lib/swift/embedded/Swift.swiftmodule/arm64-apple-none-macho.swiftmodule
-- Warning: non-executable source files are different, skipping:
./macosx-arm64/Applications/Xcode.app/Contents/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-10-08-a.xctoolchain/usr/lib/swift/embedded/Swift.swiftmodule/arm64e-apple-macos.swiftmodule
./macosx-x86_64/Applications/Xcode.app/Contents/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-10-08-a.xctoolchain/usr/lib/swift/embedded/Swift.swiftmodule/arm64e-apple-macos.swiftmodule
-- Warning: non-executable source files are different, skipping:
./macosx-arm64/Applications/Xcode.app/Contents/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-10-08-a.xctoolchain/usr/lib/swift/embedded/Swift.swiftmodule/x86_64-apple-macos.swiftmodule
./macosx-x86_64/Applications/Xcode.app/Contents/Developer/Toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-10-08-a.xctoolchain/usr/lib/swift/embedded/Swift.swiftmodule/x86_64-apple-macos.swiftmodule

@kubamracek
Copy link
Contributor Author

@swift-ci please test

@kubamracek kubamracek merged commit 879ffde into swiftlang:main Oct 9, 2023
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.

1 participant