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

rustc: Allow the cdylib crate type with wasm32-wasi #64188

Merged
merged 1 commit into from Sep 11, 2019

Conversation

@alexcrichton
Copy link
Member

commented Sep 5, 2019

The wasm32-wasi target respects configuration around crt-static in
general, but is defaulted to being static. This interacted badly with
code which validated the cdylib crate type for wasm32-wasi,
erroneously saying that the cdylib crate type wasn't supported on
wasm32-wasi by default. This commit sets the appropriate flag in
wasm32_wasi's target specification to indicate that the cdylib crate
type is supported regardless of crt-static

Closes #64187

The wasm32-wasi target respects configuration around `crt-static` in
general, but is defaulted to being static. This interacted badly with
code which validated the `cdylib` crate type for `wasm32-wasi`,
erroneously saying that the `cdylib` crate type wasn't supported on
`wasm32-wasi` by default. This commit sets the appropriate flag in
`wasm32_wasi`'s target specification to indicate that the `cdylib` crate
type is supported regardless of `crt-static`

Closes #64187
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Sep 5, 2019

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@varkor

This comment has been minimized.

Copy link
Member

commented Sep 10, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 10, 2019

📌 Commit bb9d3be has been approved by varkor

tmandry added a commit to tmandry/rust that referenced this pull request Sep 10, 2019
rustc: Allow the cdylib crate type with wasm32-wasi

The wasm32-wasi target respects configuration around `crt-static` in
general, but is defaulted to being static. This interacted badly with
code which validated the `cdylib` crate type for `wasm32-wasi`,
erroneously saying that the `cdylib` crate type wasn't supported on
`wasm32-wasi` by default. This commit sets the appropriate flag in
`wasm32_wasi`'s target specification to indicate that the `cdylib` crate
type is supported regardless of `crt-static`

Closes rust-lang#64187
bors added a commit that referenced this pull request Sep 10, 2019
Rollup of 6 pull requests

Successful merges:

 - #64060 (Improve hygiene of `alloc::format!`)
 - #64072 (Replace file_stem by file_name in rustdoc markdown)
 - #64085 (Tweak unsatisfied HRTB errors)
 - #64188 (rustc: Allow the cdylib crate type with wasm32-wasi)
 - #64250 (save-analysis: Nest typeck tables when processing functions/methods)
 - #64349 (documentation for AtomicPtr CAS operations)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 10, 2019
rustc: Allow the cdylib crate type with wasm32-wasi

The wasm32-wasi target respects configuration around `crt-static` in
general, but is defaulted to being static. This interacted badly with
code which validated the `cdylib` crate type for `wasm32-wasi`,
erroneously saying that the `cdylib` crate type wasn't supported on
`wasm32-wasi` by default. This commit sets the appropriate flag in
`wasm32_wasi`'s target specification to indicate that the `cdylib` crate
type is supported regardless of `crt-static`

Closes rust-lang#64187
bors added a commit that referenced this pull request Sep 10, 2019
Rollup of 6 pull requests

Successful merges:

 - #64060 (Improve hygiene of `alloc::format!`)
 - #64072 (Replace file_stem by file_name in rustdoc markdown)
 - #64085 (Tweak unsatisfied HRTB errors)
 - #64129 (vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn)
 - #64188 (rustc: Allow the cdylib crate type with wasm32-wasi)
 - #64349 (documentation for AtomicPtr CAS operations)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 11, 2019
rustc: Allow the cdylib crate type with wasm32-wasi

The wasm32-wasi target respects configuration around `crt-static` in
general, but is defaulted to being static. This interacted badly with
code which validated the `cdylib` crate type for `wasm32-wasi`,
erroneously saying that the `cdylib` crate type wasn't supported on
`wasm32-wasi` by default. This commit sets the appropriate flag in
`wasm32_wasi`'s target specification to indicate that the `cdylib` crate
type is supported regardless of `crt-static`

Closes rust-lang#64187
bors added a commit that referenced this pull request Sep 11, 2019
Rollup of 6 pull requests

Successful merges:

 - #64060 (Improve hygiene of `alloc::format!`)
 - #64072 (Replace file_stem by file_name in rustdoc markdown)
 - #64129 (vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn)
 - #64188 (rustc: Allow the cdylib crate type with wasm32-wasi)
 - #64326 (Fixed documentation within c_str::from_ptr)
 - #64349 (documentation for AtomicPtr CAS operations)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

☔️ The latest upstream changes (presumably #64369) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors merged commit bb9d3be into rust-lang:master Sep 11, 2019
4 checks passed
4 checks passed
pr Build #20190905.36 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
@alexcrichton alexcrichton deleted the alexcrichton:wasi-cdylib branch Sep 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.