Skip to content

Commit

Permalink
Rollup merge of rust-lang#54402 - bgermann:master, r=alexcrichton
Browse files Browse the repository at this point in the history
Use no_default_libraries for all NetBSD flavors

The no_default_libraries was introduced in rust-lang#28578 because the
NetBSD-based rumprun needed to disable the link flag.
This moves the definition to be used by all NetBSD linker flavors to
close rust-lang#49627.

A different solution would be adding -lc but as there is no platform
with explicit -lc, this approach is used.
  • Loading branch information
pietroalbini authored Sep 22, 2018
2 parents 5d8a27e + 36d562f commit 8455a7f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions src/librustc_target/spec/netbsd_base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ pub fn opts() -> TargetOptions {
executables: true,
target_family: Some("unix".to_string()),
linker_is_gnu: true,
no_default_libraries: false,
has_rpath: true,
pre_link_args: args,
position_independent_executables: true,
Expand Down
1 change: 0 additions & 1 deletion src/librustc_target/spec/x86_64_rumprun_netbsd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ pub fn target() -> TargetResult {
base.has_rpath = false;
base.position_independent_executables = false;
base.disable_redzone = true;
base.no_default_libraries = false;
base.exe_allocation_crate = None;
base.stack_probes = true;

Expand Down

0 comments on commit 8455a7f

Please sign in to comment.