Skip to content

Commit eefaca2

Browse files
committed
Rename environment variable to avoid conflicts with other packages
1 parent c361f78 commit eefaca2

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Package.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,9 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
10221022
]
10231023
}
10241024

1025-
if ProcessInfo.processInfo.environment["SWIFTPM_SWBUILD_FRAMEWORK"] == nil {
1025+
if ProcessInfo.processInfo.environment["SWIFTPM_SWBUILD_FRAMEWORK"] == nil &&
1026+
ProcessInfo.processInfo.environment["SWIFTPM_NO_SWBUILD_DEPENDENCY"] == nil {
1027+
10261028
let swiftbuildsupport: Target = package.targets.first(where: { $0.name == "SwiftBuildSupport" } )!
10271029
swiftbuildsupport.dependencies += [
10281030
.product(name: "SwiftBuild", package: "swift-build"),

Utilities/bootstrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ def get_swiftpm_env_cmd(args):
782782

783783
if args.llbuild_link_framework:
784784
env_cmd.append("SWIFTPM_LLBUILD_FWK=1")
785-
env_cmd.append("SWIFTPM_SWBUILD_FRAMEWORK=1")
785+
env_cmd.append("SWIFTPM_NO_SWBUILD_DEPENDENCY=1")
786786
env_cmd.append("SWIFTCI_USE_LOCAL_DEPS=1")
787787
env_cmd.append("SWIFTPM_MACOS_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target)
788788

0 commit comments

Comments
 (0)