Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Do not propagate host RUSTFLAGS when checking for WASM toolchain#9926

Merged
3 commits merged intoparitytech:masterfrom
koute:master_wasm_check_rustflags
Oct 4, 2021
Merged

Do not propagate host RUSTFLAGS when checking for WASM toolchain#9926
3 commits merged intoparitytech:masterfrom
koute:master_wasm_check_rustflags

Conversation

@koute
Copy link
Contributor

@koute koute commented Oct 4, 2021

I usually export RUSTFLAGS with an alternative linker (mold) to speed up the compilation for development builds; unfortunately the check for the WASM toolchain fails when you do this as it then tries to use this linker for wasm32-unknown-unknown which obviously doesn't work. This PR fixes this issue by simply clearing RUSTFLAGS beforehand.

@koute koute added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels Oct 4, 2021
bkchr
bkchr approved these changes Oct 4, 2021
View reviewed changes
Copy link
Member

@bkchr bkchr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good find! But we should also remove the normal RUSTFLAGS, because that will otherwise be picked up.

bkchr
bkchr reviewed Oct 4, 2021
View reviewed changes
@bkchr
Copy link
Member

bkchr commented Oct 4, 2021

bot merge

@ghost
Copy link

ghost commented Oct 4, 2021

Waiting for commit status.

@ghost
Copy link

ghost commented Oct 4, 2021

Bot will approve on the behalf of @bkchr, since they are a team lead, in an attempt to reach the minimum approval count

@ghost
Copy link

ghost commented Oct 4, 2021

Merge failed: Could not recover from: "Required status check \"continuous-integration/gitlab-check-polkadot-companion-build\" is failing. At least 2 approving reviews are required by reviewers with write access." due to: WithIssue: Error merging: "Required status check \"continuous-integration/gitlab-check-polkadot-companion-build\" is failing."

@bkchr
Copy link
Member

bkchr commented Oct 4, 2021

bot merge

@ghost
Copy link

ghost commented Oct 4, 2021

Trying merge.

@ordian
Copy link

ordian commented Oct 4, 2021

bot merge

@ghost
Copy link

ghost commented Oct 4, 2021

Trying merge.

@ghost ghost merged commit 6c0c9c9 into paritytech:master Oct 4, 2021
ordian added a commit that referenced this pull request Oct 5, 2021
@ordian
Merge branch 'master' into andre/staking-offences-era
b15ea73 
* master: (125 commits)
  Update multiple dependencies (#9936)
  Speed up timestamp generation when logging (#9933)
  First word should be Substrate not Polkadot (#9935)
  Improved file not found error message (#9931)
  don't read events in elections anymore. (#9898)
  Remove incorrect sanity check (#9924)
  Require crypto scheme for `insert-key` (#9909)
  chore: refresh of the substrate_builder image (#9808)
  Introduce block authorship soft deadline (#9663)
  Rework Transaction Priority calculation (#9834)
  Do not propagate host RUSTFLAGS when checking for WASM toolchain (#9926)
  Small quoting comment fix (#9927)
  add clippy to CI (#9694)
  Ensure BeforeBestBlockBy voting rule accounts for base (#9920)
  rm `.maintain` lock (#9919)
  Downstream `node-template` pull (#9915)
  Implement core::fmt::Debug for BoundedVec (#9914)
  Quickly skip invalid transactions during block authorship. (#9789)
  Add SS58 prefix for Automata (#9805)
  Clean up sc-peerset (#9806)
  ...
@MOZGIII
Copy link
Contributor

MOZGIII commented Nov 16, 2021 •
edited
Loading

I stumble upon a similar issue, but it seems like in my case RUSTFLAGS are still picked up from .cargo/config.toml. Any idea how to fix it?
UPD: figured a potential fix, working on a PR.

@MOZGIII MOZGIII mentioned this pull request Nov 16, 2021
Merged
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@bkchr bkchr bkchr approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@koute @bkchr @ordian @MOZGIII @gilescope