MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 23:44:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use -unknown- instead of -elf-

Browse Source
This commit is contained in:
Ian Douglas Scott 2017-08-07 15:35:37 -07:00
parent 219464b4d0
commit 230fda9ecf
No known key found for this signature in database
GPG Key ID: 4924E10E199B5959
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cargo/config
View File

@ -1,3 +1,3 @@
[target.x86_64-unknown-redox]
linker = "x86_64-elf-redox-gcc"
linker = "x86_64-unknown-redox-gcc"
rustflags = []

5
config.sh
View File

@ -4,13 +4,12 @@ set -e
# Configuration
ARCH=x86_64
export TARGET=$ARCH-unknown-redox
HOST=$ARCH-elf-redox
RUST_HOST=$ARCH-unknown-redox
HOST=$TARGET
# Automatic variables
ROOT="$(cd `dirname "$0"` && pwd)"
REPO="$ROOT/repo/$TARGET"
export CC="x86_64-elf-redox-gcc"
export CC="$HOST-gcc"
export XARGO_HOME="$ROOT/xargo"
if [[ "$OSTYPE" == "darwin"* ]]; then

6
recipes/rust/recipe.sh
View File

@ -54,10 +54,10 @@ function recipe_clean {
function recipe_stage {
binpath="$1/bin"
libpath="$1/lib/rustlib/${RUST_HOST}/lib"
libpath="$1/lib/rustlib/${TARGET}/lib"
mkdir -p "$binpath" "$libpath"
cp -fv "build/${RUST_HOST}/stage2/bin/rustc" "$binpath"
cp -fv "build/${TARGET}/stage2/bin/rustc" "$binpath"
${HOST}-strip "$binpath/rustc"
cp -fv $(find build/${RUST_HOST}/stage2/lib/rustlib/${RUST_HOST}/lib/ -type f | grep -v librustc) "$libpath"
cp -fv $(find build/${TARGET}/stage2/lib/rustlib/${TARGET}/lib/ -type f | grep -v librustc) "$libpath"
skip=1
}