Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix windows build after crossbeam-epoch patch #27052

Merged
merged 1 commit into from
Aug 10, 2022

Conversation

ryoqun
Copy link
Member

@ryoqun ryoqun commented Aug 10, 2022

Problem

I broke windows build after #26555

   Compiling crossbeam-epoch v0.9.5 (https://github.com/solana-labs/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d70)
error: expected item, found `..`
 --> C:\Users\runneradmin\.cargo\git\checkouts\crossbeam-2841e3eed153c98b\fd279d7\crossbeam-epoch\no_atomic.rs:1:1
  |
1 | ../no_atomic.rs
  | ^^

error[E0425]: cannot find value `NO_ATOMIC_CAS` in this scope
  --> C:\Users\runneradmin\.cargo\git\checkouts\crossbeam-2841e3eed153c98b\fd279d7\crossbeam-epoch\build.rs:27:8
   |
27 |     if NO_ATOMIC_CAS.contains(&&*target) {
   |        ^^^^^^^^^^^^^ not found in this scope

For more information about this error, try `rustc --explain E0425`.
error: could not compile `crossbeam-epoch` due to 2 previous errors
warning: build failed, waiting for other jobs to finish...
error: build failed

Summary of Changes

Fixes #

@ryoqun
Copy link
Member Author

ryoqun commented Aug 10, 2022

shellcheck passed. :)

let's see on the master branch... cc: @yihau @willhickey

@ryoqun ryoqun merged commit 773a4dd into solana-labs:master Aug 10, 2022
xiangzhu70 pushed a commit to xiangzhu70/solana that referenced this pull request Aug 17, 2022
mergify bot pushed a commit that referenced this pull request Aug 17, 2022
willhickey pushed a commit that referenced this pull request Aug 17, 2022
mergify bot added a commit that referenced this pull request Aug 17, 2022
Fix windows build after crossbeam-epoch patch (#27052)

(cherry picked from commit 773a4dd)

Co-authored-by: Ryo Onodera <[email protected]>
ryoqun added a commit that referenced this pull request Aug 23, 2022
ryoqun added a commit that referenced this pull request Aug 23, 2022
…" (#27328)

Revert "Fix windows build after crossbeam-epoch patch (backport #27052) (#27198)"

This reverts commit ed38458.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants