diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2018-09-22 09:56:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 09:56:35 +0200 |
| commit | 8455a7fcbe2a0ff5005ec5643a3300e6d4833543 (patch) | |
| tree | 1b30d727a9491c3fb24292918ef61491ab26f95e | |
| parent | 5d8a27e4da31440470979e9a85f61fd2b72dc9f5 (diff) | |
| parent | 36d562ff2305242d528d0d51b666e4a15e6bf811 (diff) | |
| download | rust-8455a7fcbe2a0ff5005ec5643a3300e6d4833543.tar.gz rust-8455a7fcbe2a0ff5005ec5643a3300e6d4833543.zip | |
Rollup merge of #54402 - bgermann:master, r=alexcrichton
Use no_default_libraries for all NetBSD flavors The no_default_libraries was introduced in #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 #49627. A different solution would be adding -lc but as there is no platform with explicit -lc, this approach is used.
| -rw-r--r-- | src/librustc_target/spec/netbsd_base.rs | 1 | ||||
| -rw-r--r-- | src/librustc_target/spec/x86_64_rumprun_netbsd.rs | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_target/spec/netbsd_base.rs b/src/librustc_target/spec/netbsd_base.rs index 8b6bb5dec91..8cb5a33cdb5 100644 --- a/src/librustc_target/spec/netbsd_base.rs +++ b/src/librustc_target/spec/netbsd_base.rs @@ -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, diff --git a/src/librustc_target/spec/x86_64_rumprun_netbsd.rs b/src/librustc_target/spec/x86_64_rumprun_netbsd.rs index af846653af7..684bf5a6c10 100644 --- a/src/librustc_target/spec/x86_64_rumprun_netbsd.rs +++ b/src/librustc_target/spec/x86_64_rumprun_netbsd.rs @@ -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; |