Add kind field to buildinfo.json

luismarques · lenary · commit 3f819d1ad064 · 2020-06-02T22:12:14.000+01:00
This helps OpenTitan's `get-toolchain.py` tool differentiate between the GCC
and GCC+Clang toolchains, even if they have the same version.
diff --git a/build-clang-with-args.sh b/build-clang-with-args.sh
@@ -171,6 +171,7 @@ BUILDINFO
 tee "${toolchain_dest}/buildinfo.json" <<BUILDINFO_JSON
 {
   "toolchain_config": "${toolchain_name}",
+  "kind: "combined",
   "version": "${tag_name}",
   "clang_version": "${clang_version_string}",
   "clang_git": "${LLVM_VERSION}",
diff --git a/build-gcc-with-args.sh b/build-gcc-with-args.sh
@@ -149,6 +149,7 @@ BUILDINFO
 tee "${toolchain_dest}/buildinfo.json" <<BUILDINFO_JSON
 {
   "toolchain_config": "${toolchain_name}",
+  "kind: "gcc-only",
   "version": "${tag_name}",
   "gcc_version": "${gcc_version_string}",
   "qemu_version": "${qemu_version_string}",

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ BUILDINFO`
`171`	`171`	`tee "${toolchain_dest}/buildinfo.json" <<BUILDINFO_JSON`
`172`	`172`	`{`
`173`	`173`	`"toolchain_config": "${toolchain_name}",`
	`174`	`+ "kind: "combined",`
`174`	`175`	`"version": "${tag_name}",`
`175`	`176`	`"clang_version": "${clang_version_string}",`
`176`	`177`	`"clang_git": "${LLVM_VERSION}",`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ BUILDINFO`
`149`	`149`	`tee "${toolchain_dest}/buildinfo.json" <<BUILDINFO_JSON`
`150`	`150`	`{`
`151`	`151`	`"toolchain_config": "${toolchain_name}",`
	`152`	`+ "kind: "gcc-only",`
`152`	`153`	`"version": "${tag_name}",`
`153`	`154`	`"gcc_version": "${gcc_version_string}",`
`154`	`155`	`"qemu_version": "${qemu_version_string}",`