Skip to content
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

Revert "Support macros when cross-compiling (#7118)" #7352

Merged
merged 2 commits into from
Feb 20, 2024

Conversation

MaxDesiatov
Copy link
Contributor

@MaxDesiatov MaxDesiatov commented Feb 20, 2024

Reverted #7118.

This should unblock swift-syntax PR testing, for example swiftlang/swift-syntax#2493

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov MaxDesiatov self-assigned this Feb 20, 2024
@MaxDesiatov MaxDesiatov added bug cross-compilation build system Changes to interactions with build systems swift build Changes impacting `swift build` and removed swift build Changes impacting `swift build` labels Feb 20, 2024
@MaxDesiatov MaxDesiatov enabled auto-merge (squash) February 20, 2024 17:35
@MaxDesiatov MaxDesiatov requested a review from ahoppen February 20, 2024 17:36
@MaxDesiatov MaxDesiatov merged commit adfbd9a into main Feb 20, 2024
5 checks passed
@MaxDesiatov MaxDesiatov deleted the maxd/revert-cross-compilation branch February 20, 2024 19:53
MaxDesiatov added a commit that referenced this pull request Feb 20, 2024
MaxDesiatov added a commit that referenced this pull request Apr 17, 2024
…#7353)

Reverts #7352.

Modified to build tests for the host triple when any macros are added to test modules directly as dependencies.
furby-tm pushed a commit to wabiverse/swift-package-manager that referenced this pull request May 15, 2024
furby-tm pushed a commit to wabiverse/swift-package-manager that referenced this pull request May 15, 2024
…swiftlang#7352)" (swiftlang#7353)

Reverts swiftlang#7352.

Modified to build tests for the host triple when any macros are added to test modules directly as dependencies.
furby-tm pushed a commit to wabiverse/swift-package-manager that referenced this pull request May 15, 2024
furby-tm pushed a commit to wabiverse/swift-package-manager that referenced this pull request May 15, 2024
…swiftlang#7352)" (swiftlang#7353)

Reverts swiftlang#7352.

Modified to build tests for the host triple when any macros are added to test modules directly as dependencies.
MaxDesiatov added a commit that referenced this pull request Jun 6, 2024
…#7353)

Reverts #7352.

Modified to build tests for the host triple when any macros are added to test modules directly as dependencies.

(cherry picked from commit cb3b085)

# Conflicts:
#	CHANGELOG.md
#	Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift
#	Sources/Build/BuildManifest/LLBuildManifestBuilder.swift
#	Sources/Build/BuildPlan/BuildPlan.swift
#	Sources/Commands/SwiftTestCommand.swift
#	Sources/Commands/Utilities/PluginDelegate.swift
#	Sources/Commands/Utilities/TestingSupport.swift
#	Sources/PackageGraph/ModulesGraph+Loading.swift
#	Sources/PackageGraph/ModulesGraph.swift
#	Sources/SPMTestSupport/MockBuildTestHelper.swift
#	Sources/SPMTestSupport/MockPackageGraphs.swift
#	Sources/SPMTestSupport/PackageGraphTester.swift
#	Sources/SPMTestSupport/ResolvedTarget+Mock.swift
#	Tests/BuildTests/ClangTargetBuildDescriptionTests.swift
#	Tests/BuildTests/CrossCompilationBuildPlanTests.swift
#	Tests/SourceKitLSPAPITests/SourceKitLSPAPITests.swift
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug build system Changes to interactions with build systems cross-compilation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants