Skip to content

Commit f3bc1e4

Browse files
authored
Merge pull request #2269 from ole/patch-8
SE-0387: Fix JSON syntax
2 parents dcbdc81 + 1a77f84 commit f3bc1e4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

proposals/0387-cross-compilation-destinations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ that, separate toolset configuration files are introduced:
208208
```json5
209209
{
210210
"schemaVersion": "1.0",
211-
"toolsetRootPath": "optional path to a root directory containing toolchain executables",
212-
// If `toolsetRootPath` is specified, all relative paths below will be resolved relative to `toolsetRootPath`.
211+
"rootPath": "optional path to a root directory containing toolchain executables",
212+
// If `rootPath` is specified, all relative paths below will be resolved relative to `rootPath`.
213213
"swiftCompiler": {
214214
"path": "<optional path to the Swift compiler>",
215215
"extraCLIOptions": ["<optional array of additional flags passed to the Swift compiler>"]
@@ -287,7 +287,7 @@ in subsequent `--toolset` options will shadow tools from previous options with t
287287
specified in `toolset2.json`, but `/usr/bin/clang -pedantic` from `toolset1.json` will still be used.
288288

289289
Tools not specified in any of the supplied toolset files will be looked up in existing implied search paths that are
290-
used without toolsets, even when `toolsetRootPath` is present. We'd like toolsets to be explicit in this regard: if a
290+
used without toolsets, even when `rootPath` is present. We'd like toolsets to be explicit in this regard: if a
291291
tool would like to participate in toolset path lookups, it must provide either a relative or an absolute path in a
292292
toolset.
293293

0 commit comments

Comments
 (0)