Skip to content

Commit 2bf6acc

Browse files
zeroomegaCQ Bot
authored andcommitted
[winsdk] Fix a bug in winsdk script's JSON output
This path fixes an issue that the script append the path separator in the wrong location. Bug: 99600 Change-Id: I785a8017552724d06c628a7fc7d798150ff8e215 Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/708488 Fuchsia-Auto-Submit: Haowei Wu <haowei@google.com> Reviewed-by: Petr Hosek <phosek@google.com> Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com> Commit-Queue: Haowei Wu <haowei@google.com>
1 parent b06e866 commit 2bf6acc

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tools/winsdk/winsdk.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,9 @@ func addEnvSetup(files *[]packedFile, vcToolsPath string) (string, error) {
474474
{"Windows Kits", WinKitVersion, "UnionMetadata", sdkVersion},
475475
}
476476
// Common entries to all platforms.
477-
vcToolsInstallDir := append(vcToolsParts, string(filepath.Separator))
477+
// vcToolsInstallDir needs to end with a path separator.
478+
vcToolsInstallDir := vcToolsParts
479+
vcToolsInstallDir[len(vcToolsInstallDir)-1] += string(filepath.Separator)
478480
env := map[string][][]string{
479481
"VSINSTALLDIR": {{`.\`}},
480482
"VCINSTALLDIR": {{`VC\`}},

0 commit comments

Comments
 (0)