Skip to content

Fix –-toolchain value shadowed by local executables #7483

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.

Sign up for GitHub

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 42 commits into from
Jun 6, 2024
Merged

Fix –-toolchain value shadowed by local executables #7483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d91abb3
Cover `–-toolchain` argument in `SwiftCommandStateTests`
MaxDesiatov Apr 23, 2024
82c0b88
Fix `InMemoryFileSystem.swift` not present in `CMakeLists.txt`
MaxDesiatov Apr 23, 2024
e5530ce
Fix `SourceKitLSPAPITests` build error
MaxDesiatov Apr 23, 2024
e546eb7
Fix `testAndroidCompilerFlags`
MaxDesiatov Apr 23, 2024
dc40bcb
Formatting cleanup
MaxDesiatov Apr 23, 2024
a16b586
Reproduce the issue with `SWIFTPM_CUSTOM_BIN_DIR`
MaxDesiatov Apr 23, 2024
3579dcd
Merge branch 'main' of github.com:apple/swift-package-manager into ma…
MaxDesiatov May 2, 2024
ff1ed06
Prepend toolset paths in `SwiftSDK` to respect `--toolchain` option
MaxDesiatov May 2, 2024
f903c7f
Restore environment after updating it
MaxDesiatov May 2, 2024
5b47636
Inject environment consistent with injected file system
MaxDesiatov May 2, 2024
f8f7822
Fix `Workspace` environment injection
MaxDesiatov May 2, 2024
669577e
Merge branch 'main' of github.com:apple/swift-package-manager into ma…
MaxDesiatov May 3, 2024
666cf96
Use process environment for determining the host toolchain
MaxDesiatov May 3, 2024
b733dd6
Use local file system for the host toolchain
MaxDesiatov May 3, 2024
a7292fa
Merge branch 'main' of github.com:apple/swift-package-manager into ma…
MaxDesiatov May 9, 2024
5650a82
Fix build issues after merge
MaxDesiatov May 9, 2024
c36881c
Create fake `swiftc` on `InMemoryFileSystem` in `MockWorkspace`
MaxDesiatov May 10, 2024
53fa291
Create all required tools as executables in `MockWorkspace`
MaxDesiatov May 10, 2024
bb2fdcb
Make sure toolchain is correctly mocked in failing tests
MaxDesiatov May 10, 2024
637e694
Fix wrong environment used in `testRepositoryPackageContainerCache`
MaxDesiatov May 10, 2024
d114ad4
Fix remaining test failures
MaxDesiatov May 10, 2024
7c61ed5
Prepopulate host triple in `MockWorkspace`
MaxDesiatov May 10, 2024
64b42c4
Generalize `customHostToolchain` of `MockWorkspace`
MaxDesiatov May 10, 2024
dffdb7e
Fix `SourceControlPackageContainerTests`
MaxDesiatov May 10, 2024
d27e0a7
Fix `RegistryPackageContainerTests`
MaxDesiatov May 10, 2024
f53c9c9
Fix remaining `WorkspaceTests`
MaxDesiatov May 10, 2024
1f2a1ca
Specify host triple for mock Swift SDK in `testUserToolchainCompileFl…
MaxDesiatov May 10, 2024
f1f86fd
Fixes in `BuildPlanTests`
MaxDesiatov May 10, 2024
91a7809
Fix target triple in `testUserToolchainCompileFlags`
MaxDesiatov May 10, 2024
ce70582
Precompute host triple in `testUserToolchainWithToolsetCompileFlags`
MaxDesiatov May 10, 2024
74909d7
Fix missing `fileSystem` argument in `testUserToolchainWithToolsetCom…
MaxDesiatov May 10, 2024
28d1484
Revert "Prepend toolset paths in `SwiftSDK` to respect `--toolchain` …
xedin May 16, 2024
d7f50e0
NFC: Rename `SwiftSDK.add` to `SwiftSDK.append` to better reflect the…
xedin May 16, 2024
04904e2
[SwiftSDK] Prepend custom toolchain into root paths to give it priority
xedin May 16, 2024
133fbee
[CoreCommands] Pipe environment through to the host toolchain
xedin May 16, 2024
447bb27
Merge remote-tracking branch 'origin/main' into maxd/test-toolchain-a…
xedin May 16, 2024
dfa56d3
Revert "[CoreCommands] Pipe environment through to the host toolchain"
xedin May 17, 2024
a7f8121
[Tests] NFC: Improve SwiftCommandStateTests.testToolchaArgument
xedin May 17, 2024
ad05fcb
Merge branch 'main' of github.com:apple/swift-package-manager into ma…
MaxDesiatov Jun 3, 2024
1674834
Merge branch 'main' of github.com:apple/swift-package-manager into ma…
MaxDesiatov Jun 5, 2024
3ed79e8
Fix `testToolchainArgument` on all platforms
MaxDesiatov Jun 5, 2024
e4968d0
Override host triple in `SwiftCommandStateTests`
MaxDesiatov Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Sources/Basics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ add_library(Basics
Errors.swift
FileSystem/AbsolutePath.swift
FileSystem/FileSystem+Extensions.swift
FileSystem/InMemoryFileSystem.swift
FileSystem/NativePathExtensions.swift
FileSystem/RelativePath.swift
FileSystem/TemporaryFile.swift
Expand Down
3 changes: 1 addition & 2 deletions Sources/Basics/FileSystem/FileSystem+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// This source file is part of the Swift open source project
//
// Copyright (c) 2020-2021 Apple Inc. and the Swift project authors
// Copyright (c) 2020-2024 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See http://swift.org/LICENSE.txt for license information
Expand All @@ -21,7 +21,6 @@ import class TSCBasic.FileLock
import enum TSCBasic.FileMode
import protocol TSCBasic.FileSystem
import enum TSCBasic.FileSystemAttribute
import class TSCBasic.InMemoryFileSystem
import var TSCBasic.localFileSystem
import protocol TSCBasic.WritableByteStream

Expand Down
Loading