Add options to --extern flag. #67074

ehuss · 2019-12-06T02:29:16Z

This changes the --extern flag so that it can take a series of options that changes its behavior. The general syntax is [opts ':'] name ['=' path] where opts is a comma separated list of options. Two options are supported, priv which replaces --extern-private and noprelude which avoids adding the crate to the extern prelude.

--extern priv:mylib=/path/to/libmylib.rlib
--extern noprelude:alloc=/path/to/liballoc.rlib

noprelude is to be used by Cargo's build-std feature in order to use --extern to reference standard library crates.

This also includes a second commit which adds the aux-crate directive to compiletest. I can split this off into a separate PR if desired, but it helps with defining these kinds of tests. It is based on #54020, and can be used in the future to replace and simplify some of the Makefile tests.

ehuss · 2019-12-06T02:29:43Z

cc @alexcrichton
There is a companion branch for Cargo at https://github.com/ehuss/cargo/tree/build-std-no-sysroot

eddyb · 2019-12-06T04:27:42Z

cc @petrochenkov

alexcrichton · 2019-12-06T15:04:33Z

👍

Looks great to me!

That Cargo patch is also 💯

src/tools/compiletest/src/header.rs

src/librustc_session/config.rs

src/librustdoc/core.rs

src/librustc_resolve/lib.rs

src/librustc_metadata/locator.rs

petrochenkov · 2019-12-06T18:09:42Z

r? @petrochenkov

ehuss · 2019-12-07T19:21:48Z

Thanks for taking a look @petrochenkov !

src/librustc_session/config.rs

petrochenkov · 2019-12-08T09:49:30Z

r=me with the remaining nit addressed and non-compiletest commits squashed.

ehuss · 2019-12-09T16:27:41Z

@bors r=petrochenkov

bors · 2019-12-09T16:27:42Z

📌 Commit 60d4e20 has been approved by petrochenkov

bors · 2019-12-09T17:16:06Z

⌛ Testing commit 60d4e20 with merge ce0c20a...

Add options to --extern flag. This changes the `--extern` flag so that it can take a series of options that changes its behavior. The general syntax is `[opts ':'] name ['=' path]` where `opts` is a comma separated list of options. Two options are supported, `priv` which replaces `--extern-private` and `noprelude` which avoids adding the crate to the extern prelude. ```text --extern priv:mylib=/path/to/libmylib.rlib --extern noprelude:alloc=/path/to/liballoc.rlib ``` `noprelude` is to be used by Cargo's build-std feature in order to use `--extern` to reference standard library crates. This also includes a second commit which adds the `aux-crate` directive to compiletest. I can split this off into a separate PR if desired, but it helps with defining these kinds of tests. It is based on #54020, and can be used in the future to replace and simplify some of the Makefile tests.

bors · 2019-12-09T19:42:43Z

💔 Test failed - checks-azure

rust-highfive · 2019-12-09T19:42:44Z

The job x86_64-msvc-cargo of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-12-09T17:17:32.0443453Z 
2019-12-09T17:17:32.0443781Z 
2019-12-09T17:17:32.0444096Z 
2019-12-09T17:17:32.0444381Z 
2019-12-09T17:17:32.0444747Z --extern noprelude:alloc=/path/to/liballoc.rlib
2019-12-09T17:17:32.0445298Z --extern priv:mylib=/path/to/libmylib.rlib
2019-12-09T17:17:32.0446684Z AGENT_DISABLELOGPLUGIN_TESTFILEPUBLISHERPLUGIN=true
2019-12-09T17:17:32.0447408Z AGENT_DISABLELOGPLUGIN_TESTRESULTLOGPLUGIN=true
2019-12-09T17:17:32.0447551Z AGENT_HOMEDIRECTORY=C:\agents\2.160.1
2019-12-09T17:17:32.0447641Z AGENT_ID=525
---
2019-12-09T17:17:32.0471322Z TMP=/tmp
2019-12-09T17:17:32.0471391Z TOOLSTATE_ISSUES_API_URL=https://api.github.com/repos/rust-lang/rust/issues
2019-12-09T17:17:32.0471476Z TOOLSTATE_PUBLISH=1
2019-12-09T17:17:32.0471549Z TOOLSTATE_REPO=https://github.com/rust-lang-nursery/rust-toolstate
2019-12-09T17:17:32.0471717Z This also includes a second commit which adds the `aux-crate` directive to compiletest. I can split this off into a separate PR if desired, but it helps with defining these kinds of tests. It is based on #54020, and can be used in the future to replace and simplify some of the Makefile tests.
2019-12-09T17:17:32.0472192Z This changes the `--extern` flag so that it can take a series of options that changes its behavior. The general syntax is `[opts ':'] name ['=' path]` where `opts` is a comma separated list of options. Two options are supported, `priv` which replaces `--extern-private` and `noprelude` which avoids adding the crate to the extern prelude.
2019-12-09T17:17:32.0472436Z USERDOMAIN=fv-az425
2019-12-09T17:17:32.0472515Z USERDOMAIN_ROAMINGPROFILE=fv-az425
2019-12-09T17:17:32.0472581Z USERNAME=VssAdministrator
2019-12-09T17:17:32.0472661Z USERPROFILE=C:\Users\VssAdministrator
---
2019-12-09T17:17:32.0473251Z WIX=C:\Program Files (x86)\WiX Toolset v3.11\
2019-12-09T17:17:32.0473318Z _=/usr/bin/printenv
2019-12-09T17:17:32.0473393Z ```
2019-12-09T17:17:32.0473460Z ```text
2019-12-09T17:17:32.0473549Z `noprelude` is to be used by Cargo's build-std feature in order to use `--extern` to reference standard library crates.
2019-12-09T17:17:32.0473698Z 
2019-12-09T17:17:32.0473769Z disk usage:
2019-12-09T17:17:32.1132644Z Filesystem            Size  Used Avail Use% Mounted on
2019-12-09T17:17:32.1143754Z C:/Program Files/Git  256G  141G  116G  55% /
---
2019-12-09T19:41:15.0714238Z test workspaces::ws_warn_unused ... ok
2019-12-09T19:41:15.0716645Z 
2019-12-09T19:41:15.0717566Z failures:
2019-12-09T19:41:15.0718277Z 
2019-12-09T19:41:15.0718650Z ---- registry::bad_cksum stdout ----
2019-12-09T19:41:15.0719034Z running `D:\a\1\s\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\cargo.exe build -v`
2019-12-09T19:41:15.0719394Z thread 'registry::bad_cksum' panicked at '
2019-12-09T19:41:15.0719731Z Expected: execs
2019-12-09T19:41:15.0720041Z     but: differences:
2019-12-09T19:41:15.0720373Z   1 - |[DOWNLOADING] crates ...|
2019-12-09T19:41:15.0720715Z     + |error: process didn't exit successfully: `rustc -vV` (exit code: 0xc0000005, STATUS_ACCESS_VIOLATION)|
2019-12-09T19:41:15.0721032Z 
2019-12-09T19:41:15.0721494Z   2 - |[DOWNLOADED] bad-cksum [..]|
2019-12-09T19:41:15.0722517Z 
2019-12-09T19:41:15.0722517Z 
2019-12-09T19:41:15.0722701Z   3 - |[ERROR] failed to download replaced source registry `https://[..]`|
2019-12-09T19:41:15.0722832Z 
2019-12-09T19:41:15.0722883Z   4 - ||
2019-12-09T19:41:15.0722956Z     +
2019-12-09T19:41:15.0722986Z 
2019-12-09T19:41:15.0722986Z 
2019-12-09T19:41:15.0723060Z   5 - |Caused by:|
2019-12-09T19:41:15.0723186Z 
2019-12-09T19:41:15.0723186Z 
2019-12-09T19:41:15.0723284Z   6 - |  failed to verify the checksum of `bad-cksum v0.0.1 (registry `D:/a/1/s/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t1236[..]`)`|
2019-12-09T19:41:15.0723435Z 
2019-12-09T19:41:15.0723465Z 
2019-12-09T19:41:15.0723537Z other output:
2019-12-09T19:41:15.0723628Z ``', src\tools\cargo\crates\cargo-test-support\src\lib.rs:849:13
---
2019-12-09T19:41:15.3352615Z   local time: Mon Dec  9 19:41:15 CUT 2019
2019-12-09T19:41:15.7086160Z   network time: Mon, 09 Dec 2019 19:41:15 GMT
2019-12-09T19:41:15.7104106Z == end clock drift check ==
2019-12-09T19:41:15.7944607Z 
2019-12-09T19:41:16.1571651Z ##[error]Bash exited with code '1'.
2019-12-09T19:41:16.2288237Z ##[section]Starting: Checkout
2019-12-09T19:41:16.2866552Z ==============================================================================
2019-12-09T19:41:16.2866680Z Task         : Get sources
2019-12-09T19:41:16.2866766Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

petrochenkov · 2019-12-09T20:39:28Z

@ehuss

|[ERROR] failed to download replaced source registry https://[..]|

I guess you know better whether it's spurious or not.

ehuss · 2019-12-09T20:59:48Z

@bors retry
STATUS_ACCESS_VIOLATION on x86_64-msvc-cargo while running rustc -Vv on one of Cargo's tests (I don't think it is related to Cargo). Seems very unlikely to be related to this PR, I'm going to blame it on gremlins.

bors · 2019-12-10T13:28:44Z

⌛ Testing commit 60d4e20 with merge e574b81e5a06188176f2ec1696ad484f9dfccdf3...

rust-highfive · 2019-12-10T13:36:37Z

The job dist-powerpc64-linux of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-12-10T13:36:42Z

💔 Test failed - checks-azure

ehuss · 2019-12-10T15:17:17Z

@bors retry
failed to get 200 response from https://crates.io/api/v1/crates/rustc-ap-rustc_errors/606.0.0/download, got 502

Add options to --extern flag. This changes the `--extern` flag so that it can take a series of options that changes its behavior. The general syntax is `[opts ':'] name ['=' path]` where `opts` is a comma separated list of options. Two options are supported, `priv` which replaces `--extern-private` and `noprelude` which avoids adding the crate to the extern prelude. ```text --extern priv:mylib=/path/to/libmylib.rlib --extern noprelude:alloc=/path/to/liballoc.rlib ``` `noprelude` is to be used by Cargo's build-std feature in order to use `--extern` to reference standard library crates. This also includes a second commit which adds the `aux-crate` directive to compiletest. I can split this off into a separate PR if desired, but it helps with defining these kinds of tests. It is based on rust-lang#54020, and can be used in the future to replace and simplify some of the Makefile tests.

@ghost

Rollup of 6 pull requests Successful merges: - #66881 (Optimize Ord trait implementation for bool) - #67015 (Fix constant propagation for scalar pairs) - #67074 (Add options to --extern flag.) - #67164 (Ensure that panicking in constants eventually errors) - #67174 (Remove `checked_add` in `Layout::repeat`) - #67205 (Make `publish_toolstate.sh` executable) Failed merges: r? @ghost

Switch build-std to use --extern Switch `build-std` to use `--extern` flags instead of `--sysroot`. This is mostly a revert of #7421. It uses the new extern flag options introduced in rust-lang/rust#67074. It avoids modifying the extern prelude which was the source of the problem of rust-lang/wg-cargo-std-aware#40. Closes rust-lang/wg-cargo-std-aware#49 Reopens rust-lang/wg-cargo-std-aware#31

rust-highfive assigned eddyb Dec 6, 2019

ehuss mentioned this pull request Dec 6, 2019

Tracking issue for RFC 1977: public & private dependencies #44663

Open

27 tasks

petrochenkov self-assigned this Dec 6, 2019

petrochenkov reviewed Dec 6, 2019

View reviewed changes

rust-highfive unassigned eddyb Dec 6, 2019

petrochenkov added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 6, 2019

petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 8, 2019

petrochenkov reviewed Dec 8, 2019

View reviewed changes

src/librustc_session/config.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 8, 2019

ehuss added 2 commits December 9, 2019 08:08

Add options to --extern flag.

590dd7d

compiletest: add aux-crate directive

60d4e20

ehuss force-pushed the extern-options branch from b62fecd to 60d4e20 Compare December 9, 2019 16:26

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 9, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 9, 2019

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 9, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 9, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 10, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 10, 2019

Centril mentioned this pull request Dec 11, 2019

Rollup of 6 pull requests #67220

Merged

bors merged commit 60d4e20 into rust-lang:master Dec 11, 2019

ehuss mentioned this pull request Dec 12, 2019

Switch build-std to use --extern rust-lang/cargo#7699

Merged

0dvictor mentioned this pull request Dec 14, 2019

[experiment] Add -Z no-link flag #67195

Merged

petrochenkov mentioned this pull request Feb 16, 2022

Stabilize native library modifier syntax and the whole-archive modifier specifically #93901

Merged

This was referenced Jun 22, 2022

Tracking issue for --extern noprelude #98398

Open

Tracking issue for --extern priv #98399

Open

mhammerly mentioned this pull request Mar 21, 2023

Add force option for --extern flag #109421

Merged

ehuss mentioned this pull request Dec 5, 2024

auxiliary files in compile-test aren't compatible with extern_prelude feature #52428

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add options to --extern flag. #67074

Add options to --extern flag. #67074

ehuss commented Dec 6, 2019

ehuss commented Dec 6, 2019

eddyb commented Dec 6, 2019

alexcrichton commented Dec 6, 2019

petrochenkov commented Dec 6, 2019

ehuss commented Dec 7, 2019

petrochenkov commented Dec 8, 2019

ehuss commented Dec 9, 2019

bors commented Dec 9, 2019

bors commented Dec 9, 2019

bors commented Dec 9, 2019

rust-highfive commented Dec 9, 2019

petrochenkov commented Dec 9, 2019

ehuss commented Dec 9, 2019

bors commented Dec 10, 2019

rust-highfive commented Dec 10, 2019

bors commented Dec 10, 2019

ehuss commented Dec 10, 2019

Add options to --extern flag. #67074

Add options to --extern flag. #67074

Conversation

ehuss commented Dec 6, 2019

ehuss commented Dec 6, 2019

eddyb commented Dec 6, 2019

alexcrichton commented Dec 6, 2019

petrochenkov commented Dec 6, 2019

ehuss commented Dec 7, 2019

petrochenkov commented Dec 8, 2019

ehuss commented Dec 9, 2019

bors commented Dec 9, 2019

bors commented Dec 9, 2019

bors commented Dec 9, 2019

rust-highfive commented Dec 9, 2019

petrochenkov commented Dec 9, 2019

ehuss commented Dec 9, 2019

bors commented Dec 10, 2019

rust-highfive commented Dec 10, 2019

bors commented Dec 10, 2019

ehuss commented Dec 10, 2019