Skip to content

Commit

Permalink
Revert "Remove resolver=2 from Cargo.toml and add it to the Windows b…
Browse files Browse the repository at this point in the history
…uild" (solana-labs#27011)

Revert "Remove resolver=2 from Cargo.toml and add it to the Windows build (solana-labs#26706)"

This reverts commit 2f6f5b1.
  • Loading branch information
ryoqun authored Aug 9, 2022
1 parent 4d58655 commit ecda3be
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,6 @@ members = [
exclude = [
"programs/bpf",
]

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

Please sign in to comment.