Build fails

[benlaurie]

I'm trying to build this using the current HEAD and it fails with this error:

Updating crates.io index

error: failed to select a version for compiler_builtins.
... required by package cfg-if v1.0.0
... which satisfies dependency cfg-if = "^1" (locked to 1.0.0) of package crossbeam-channel v0.5.4
... which satisfies dependency crossbeam-channel = "^0.5.0" (locked to 0.5.4) of package rustc-rayon-core v0.4.1
... which satisfies dependency rayon-core = "^0.4" (locked to 0.4.1) of package rustc-rayon v0.4.0
... which satisfies dependency rustc-rayon = "^0.4" (locked to 0.4.0) of package indexmap v1.9.1
... which satisfies dependency indexmap = "^1.9.1" (locked to 1.9.1) of package bump-stage0 v0.1.0 (/Users/benl/git-work/rust-cheri/src/tools/bump-stage0)
versions that meet the requirements ^0.1.2 (locked to 0.1.82) are: 0.1.82

the package compiler_builtins links to the native library compiler-rt, but it conflicts with a previous package which links to compiler-rt as well:
package compiler_builtins v0.1.73 (https://github.com/lewis-revill/compiler-builtins-cheri.git?branch=ljr-cheri-0.1.73#6ec843c2)
... which satisfies git dependency compiler_builtins of package addr2line v0.17.0 (https://github.com/lewis-revill/addr2line-cheri.git?branch=ljr-cheri-0.17.0#6dbb6efb)
... which satisfies git dependency addr2line of package std v0.0.0 (/Users/benl/git-work/rust-cheri/library/std)
... which satisfies path dependency std (locked to 0.0.0) of package proc_macro v0.0.0 (/Users/benl/git-work/rust-cheri/library/proc_macro)
... which satisfies path dependency proc_macro (locked to 0.0.0) of package test v0.0.0 (/Users/benl/git-work/rust-cheri/library/test)
Only one package in the dependency graph may specify the same links value. This helps ensure that only one copy of a native library is linked in the final binary. Try to adjust your dependencies so that only one package uses the links ='compiler_builtins' value. For more information, see https://doc.rust-lang.org/cargo/reference/resolver.html#links.

failed to select a version for compiler_builtins which could resolve this conflict

[benlaurie]

I believe #2 fixes it.