File tree Expand file tree Collapse file tree 5 files changed +13
-10
lines changed Expand file tree Collapse file tree 5 files changed +13
-10
lines changed Original file line number Diff line number Diff line change @@ -91,7 +91,7 @@ extension Driver {
91
91
jobsBeforeCompiles. append ( job)
92
92
}
93
93
94
- var compileJobGroups = [ CompileJobGroup] ( )
94
+ var compileJobGroups = [ CompileJobGroup] ( )
95
95
func addCompileJobGroup( _ group: CompileJobGroup ) {
96
96
compileJobGroups. append ( group)
97
97
}
Original file line number Diff line number Diff line change @@ -21,12 +21,13 @@ import TSCBasic
21
21
/// The file system to use for queries.
22
22
public let fileSystem : FileSystem
23
23
24
- /// Doubles as path cache and point for overriding normal lookup
25
- private var toolPaths = [ Tool: AbsolutePath] ( )
26
-
27
24
// An externally provided path from where we should find compiler
28
25
public let compilerExecutableDir : AbsolutePath ?
29
26
27
+ /// Doubles as path cache and point for overriding normal lookup
28
+ private var toolPaths = [ Tool: AbsolutePath] ( )
29
+
30
+ // An externally provided path from where we should find tools like ld
30
31
public let toolDirectory : AbsolutePath ?
31
32
32
33
public let dummyForTestingObjectFormat = Triple . ObjectFormat. elf
Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ public enum Tool: Hashable {
102
102
103
103
extension Toolchain {
104
104
public var searchPaths : [ AbsolutePath ] {
105
- getEnvSearchPaths ( pathString: env [ " PATH " ] , currentWorkingDirectory: fileSystem. currentWorkingDirectory)
105
+ getEnvSearchPaths ( pathString: ProcessEnv . path , currentWorkingDirectory: fileSystem. currentWorkingDirectory)
106
106
}
107
107
108
108
/// Returns the `executablePath`'s directory.
Original file line number Diff line number Diff line change @@ -42,11 +42,13 @@ import SwiftOptions
42
42
/// The file system to use for queries.
43
43
public let fileSystem : FileSystem
44
44
45
+ // An externally provided path from where we should find compiler
46
+ public let compilerExecutableDir : AbsolutePath ?
47
+
45
48
/// Doubles as path cache and point for overriding normal lookup
46
49
private var toolPaths = [ Tool: AbsolutePath] ( )
47
50
48
- public let compilerExecutableDir : AbsolutePath ?
49
-
51
+ // An externally provided path from where we should find tools like ld
50
52
public let toolDirectory : AbsolutePath ?
51
53
52
54
public let dummyForTestingObjectFormat = Triple . ObjectFormat. wasm
Original file line number Diff line number Diff line change @@ -22,12 +22,12 @@ import SwiftOptions
22
22
/// The file system to use for queries.
23
23
public let fileSystem : FileSystem
24
24
25
- /// Doubles as path cache and point for overriding normal lookup
26
- private var toolPaths = [ Tool: AbsolutePath] ( )
27
-
28
25
// An externally provided path from where we should find compiler
29
26
public let compilerExecutableDir : AbsolutePath ?
30
27
28
+ /// Doubles as path cache and point for overriding normal lookup
29
+ private var toolPaths = [ Tool: AbsolutePath] ( )
30
+
31
31
// An externally provided path from where we should find tools like ld
32
32
public let toolDirectory : AbsolutePath ?
33
33
You can’t perform that action at this time.
0 commit comments