From 36f9f625c9df6ec47128b8433d0b885438f544ee Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 20 Dec 2016 17:53:16 -0700 Subject: [PATCH] Use build script to imply openlibm --- libstd/Cargo.toml | 5 +++++ rust | 2 +- x86_64-unknown-redox.json | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libstd/Cargo.toml b/libstd/Cargo.toml index 637b657..d17633e 100644 --- a/libstd/Cargo.toml +++ b/libstd/Cargo.toml @@ -2,6 +2,7 @@ name = "redox_std" version = "0.1.0" authors = ["Jeremy Soller "] +build = "../rust/src/libstd/build.rs" [lib] name = "std" @@ -14,3 +15,7 @@ panic_abort = { path = "panic_abort" } #panic_unwind = { path = "panic_unwind" } libc = { path = "libc" } unwind = { path = "unwind" } + +[build-dependencies] +build_helper = { path = "../rust/src/build_helper" } +gcc = "0.3.27" diff --git a/rust b/rust index 65eecf8..fd4bc88 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit 65eecf8bb311efe4174cb7a90271344b72371884 +Subproject commit fd4bc88880bd7aeb2a1a5cb56fbfea639bc6f2e7 diff --git a/x86_64-unknown-redox.json b/x86_64-unknown-redox.json index 49d7037..337e7a7 100644 --- a/x86_64-unknown-redox.json +++ b/x86_64-unknown-redox.json @@ -9,7 +9,6 @@ "vendor": "unknown", "target-family": "redox", "pre-link-args": ["-m64", "-nostdlib", "-static"], - "post-link-args": ["build/userspace/libopenlibm.a"], "features": "", "dynamic-linking": false, "executables": true,