diff options
| author | Jeremy Soller <jackpot51@gmail.com> | 2016-12-20 14:30:27 -0700 |
|---|---|---|
| committer | Jeremy Soller <jackpot51@gmail.com> | 2016-12-20 14:30:27 -0700 |
| commit | 01157e6b3cf3acd2c555d36e272c7ad05d837868 (patch) | |
| tree | c182e9b93857a286ac2b33985a2e260255da070d | |
| parent | 86f85c13994ab5bb17291140f8274b6529da95cf (diff) | |
| download | rust-01157e6b3cf3acd2c555d36e272c7ad05d837868.tar.gz rust-01157e6b3cf3acd2c555d36e272c7ad05d837868.zip | |
Link openlibm only in libstd
| -rw-r--r-- | src/librustc_back/target/redox_base.rs | 4 | ||||
| -rw-r--r-- | src/libstd/build.rs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/librustc_back/target/redox_base.rs b/src/librustc_back/target/redox_base.rs index d8c83b39d8e..fc4c68276b6 100644 --- a/src/librustc_back/target/redox_base.rs +++ b/src/librustc_back/target/redox_base.rs @@ -33,10 +33,6 @@ pub fn opts() -> TargetOptions { // Static link "-static".to_string() ], - late_link_args: vec![ - // Link to openlibm for math functions - "-lopenlibm".to_string() - ], executables: true, relocation_model: "static".to_string(), disable_redzone: true, diff --git a/src/libstd/build.rs b/src/libstd/build.rs index 535cb7e136c..b8f9b51172a 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -62,6 +62,8 @@ fn main() { println!("cargo:rustc-link-lib=magenta"); println!("cargo:rustc-link-lib=mxio"); println!("cargo:rustc-link-lib=launchpad"); // for std::process + } else if target.contains("redox") { + println!("cargo:rustc-link-lib=openlibm"); } } |