From 464ff0105953cf6737933949bf5af0dbaece2732 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 31 Oct 2016 12:57:38 -0600 Subject: [PATCH] Add setup script, remove openlibm from post-link (might have to readd later) --- cook.sh | 2 ++ setup.sh | 10 ++++++++++ targets/x86_64-unknown-redox.json | 1 - 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100755 setup.sh diff --git a/cook.sh b/cook.sh index 9d7d11386..f82a619cf 100755 --- a/cook.sh +++ b/cook.sh @@ -1,3 +1,5 @@ +#!/bin/bash + export RUST_TARGET_PATH=`realpath targets` export RUSTFLAGS="--cfg redox" TARGET=x86_64-unknown-redox diff --git a/setup.sh b/setup.sh new file mode 100755 index 000000000..6ee0d96d6 --- /dev/null +++ b/setup.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -e + +./cook.sh libstd unfetch +./cook.sh libstd fetch +./cook.sh libstd build +cp recipes/libstd/build/target/x86_64-unknown-redox/debug/deps/*.rlib ~/.xargo/lib/rustlib/x86_64-unknown-redox/lib/ + +echo "cook.sh is ready to use" diff --git a/targets/x86_64-unknown-redox.json b/targets/x86_64-unknown-redox.json index e0a010a06..3d6de4746 100644 --- a/targets/x86_64-unknown-redox.json +++ b/targets/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": "-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2", "dynamic-linking": false, "executables": true,