diff options
| author | bors <bors@rust-lang.org> | 2017-01-04 04:28:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-04 04:28:15 +0000 |
| commit | 01677eeef2d3536b07dced43d062f4e486fe695c (patch) | |
| tree | 254a5c725fd5e0380175dd8746abb0f491748d20 /src/librustc_back | |
| parent | a68622c899883b9871b71d5ed600166e2254d230 (diff) | |
| parent | c6858a1429895f27b4daafde9295deb494e2e29c (diff) | |
Auto merge of #38707 - redox-os:master, r=brson
Add socket timeout and ttl support in `sys::redox` This adds support for `read_timeout`, `write_timeout`, and `ttl` on `TcpStream`, `TcpListener`, and `UdpSocket` in the `sys::redox` module. The DNS lookup has been set to use a 5 second timeout by default.
Diffstat (limited to 'src/librustc_back')
| -rw-r--r-- | src/librustc_back/target/redox_base.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/librustc_back/target/redox_base.rs b/src/librustc_back/target/redox_base.rs index 1dffff59809..c5e1e107753 100644 --- a/src/librustc_back/target/redox_base.rs +++ b/src/librustc_back/target/redox_base.rs @@ -25,14 +25,7 @@ pub fn opts() -> TargetOptions { "-Wl,--as-needed".to_string(), // Always enable NX protection when it is available - "-Wl,-z,noexecstack".to_string(), - - // Static link - "-static".to_string() - ], - late_link_args: vec![ - "-lc".to_string(), - "-lm".to_string() + "-Wl,-z,noexecstack".to_string() ], executables: true, relocation_model: "static".to_string(), @@ -40,7 +33,6 @@ pub fn opts() -> TargetOptions { eliminate_frame_pointer: false, target_family: None, linker_is_gnu: true, - no_default_libraries: true, lib_allocation_crate: "alloc_system".to_string(), exe_allocation_crate: "alloc_system".to_string(), has_elf_tls: true, |