Skip to content

Commit

Permalink
Remove resolver=2 from Cargo.toml and add it to the Windows build (so…
Browse files Browse the repository at this point in the history
  • Loading branch information
willhickey authored Jul 22, 2022
1 parent 27866ae commit 2f6f5b1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,3 @@ members = [
exclude = [
"programs/bpf",
]

# This prevents a Travis CI error when building for Windows.
resolver = "2"
5 changes: 5 additions & 0 deletions ci/publish-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
;;
*)
Expand Down

0 comments on commit 2f6f5b1

Please sign in to comment.