Remove resolver=2 from Cargo.toml and add it to the Windows build (#26706)
This commit is contained in:
parent
27866aeab4
commit
2f6f5b11da
|
@ -91,6 +91,3 @@ members = [
|
|||
exclude = [
|
||||
"programs/bpf",
|
||||
]
|
||||
|
||||
# This prevents a Travis CI error when building for Windows.
|
||||
resolver = "2"
|
||||
|
|
|
@ -58,6 +58,11 @@ windows)
|
|||
git config core.symlinks true
|
||||
find . -type l -delete
|
||||
git reset --hard
|
||||
# The Windows build fails without resolver = "2", but including it in Cargo.toml causes
|
||||
# other problems (see PR #26555 and Issue #22603). This adds resolver = "2" to
|
||||
# Cargo.toml before building. Since the build environment does not persist the changes
|
||||
# are discarded after the build and do not interfere with non-Windows builds.
|
||||
echo 'resolver = "2"' >> Cargo.toml
|
||||
)
|
||||
;;
|
||||
*)
|
||||
|
|
Loading…
Reference in New Issue