Rollup merge of #107675 - jsgf:link-directives, r=davidtwco
Implement -Zlink-directives=yes/no `-Zlink-directives=no` will ignored `#[link]` directives while compiling a crate, so nothing is emitted into the crate's metadata. The assumption is that the build system already knows about the crate's native dependencies and can provide them at link time without these directives. This is another way to address issue # #70093, which is currently addressed by `-Zlink-native-libraries` (implemented in #70095). The latter is implemented at link time, which has the effect of ignoring `#[link]` in *every* crate. This makes it a very large hammer as it requires all native dependencies to be known to the build system to be at all usable, including those in sysroot libraries. I think this means its effectively unused, and definitely under-used. Being able to control this on a crate-by-crate basis should make it much easier to apply when needed. I'm not sure if we need both mechanisms, but we can decide that later. cc `@pcwalton` `@cramertj`
This commit is contained in:
commit
1a599d7d97
6 changed files with 20 additions and 1 deletions
|
@ -756,6 +756,7 @@ fn test_unstable_options_tracking_hash() {
|
|||
tracked!(instrument_coverage, Some(InstrumentCoverage::All));
|
||||
tracked!(instrument_mcount, true);
|
||||
tracked!(instrument_xray, Some(InstrumentXRay::default()));
|
||||
tracked!(link_directives, false);
|
||||
tracked!(link_only, true);
|
||||
tracked!(llvm_plugins, vec![String::from("plugin_name")]);
|
||||
tracked!(location_detail, LocationDetail { file: true, line: false, column: false });
|
||||
|
|
|
@ -103,8 +103,13 @@ impl<'tcx> Collector<'tcx> {
|
|||
}
|
||||
|
||||
// Process all of the #[link(..)]-style arguments
|
||||
let sess = &self.tcx.sess;
|
||||
let sess = self.tcx.sess;
|
||||
let features = self.tcx.features();
|
||||
|
||||
if !sess.opts.unstable_opts.link_directives {
|
||||
return;
|
||||
}
|
||||
|
||||
for m in self.tcx.hir().attrs(it.hir_id()).iter().filter(|a| a.has_name(sym::link)) {
|
||||
let Some(items) = m.meta_item_list() else {
|
||||
continue;
|
||||
|
|
|
@ -1489,6 +1489,8 @@ options! {
|
|||
"keep hygiene data after analysis (default: no)"),
|
||||
layout_seed: Option<u64> = (None, parse_opt_number, [TRACKED],
|
||||
"seed layout randomization"),
|
||||
link_directives: bool = (true, parse_bool, [TRACKED],
|
||||
"honor #[link] directives in the compiled crate (default: yes)"),
|
||||
link_native_libraries: bool = (true, parse_bool, [UNTRACKED],
|
||||
"link native libraries in the linker invocation (default: yes)"),
|
||||
link_only: bool = (false, parse_bool, [TRACKED],
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
Multiple options can be combined with commas.
|
||||
-Z keep-hygiene-data=val -- keep hygiene data after analysis (default: no)
|
||||
-Z layout-seed=val -- seed layout randomization
|
||||
-Z link-directives=val -- honor #[link] directives in the compiled crate (default: yes)
|
||||
-Z link-native-libraries=val -- link native libraries in the linker invocation (default: yes)
|
||||
-Z link-only=val -- link the `.rlink` file generated by `-Z no-link` (default: no)
|
||||
-Z llvm-plugins=val -- a list LLVM plugins to enable (space separated)
|
||||
|
|
10
tests/ui/issues/issue-70093/issue-70093-link-directives.rs
Normal file
10
tests/ui/issues/issue-70093/issue-70093-link-directives.rs
Normal file
|
@ -0,0 +1,10 @@
|
|||
// run-pass
|
||||
// compile-flags: -Zlink-directives=no
|
||||
// ignore-windows - this will probably only work on unixish systems
|
||||
// ignore-fuchsia - missing __libc_start_main for some reason (#84733)
|
||||
// ignore-cross-compile - default-linker-libraries=yes doesn't play well with cross compiling
|
||||
|
||||
#[link(name = "some-random-non-existent-library", kind = "static")]
|
||||
extern "C" {}
|
||||
|
||||
fn main() {}
|
Loading…
Add table
Reference in a new issue