diff --git a/Xargo.toml b/Xargo.toml deleted file mode 100644 index 942fbc3ac0956ce14f4c98c9f85a54868c62fec1..0000000000000000000000000000000000000000 --- a/Xargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[target.aarch64-unknown-redox.dependencies.std] -features = ["panic_unwind"] - -[target.x86_64-unknown-redox.dependencies.std] -features = ["panic_unwind"] -#features = ["panic_unwind", "backtrace"] - -#[dependencies.test] -#stage = 1 - diff --git a/clean.sh b/clean.sh index 0bf362f81c1f83b88513c6ddc4c63dbe0da84876..f4c2eb619564de3ff02127400dc5917ec1fbc86b 100755 --- a/clean.sh +++ b/clean.sh @@ -14,5 +14,3 @@ for recipe in $recipes do ./cook.sh "$recipe" distclean done - -rm -rf xargo diff --git a/config.sh b/config.sh index 4dc41ba338d77d0eb878034bcd36db2eb77c33cb..7b2d34aee05e1e3251e6019e4113f918a4ebf4ed 100755 --- a/config.sh +++ b/config.sh @@ -13,7 +13,6 @@ HOST="$TARGET" ROOT="$(cd `dirname "$0"` && pwd)" REPO="$ROOT/repo/$TARGET" export PATH="${ROOT}/bin:$PATH" -export XARGO_HOME="${ROOT}/xargo" export AR="${HOST}-gcc-ar" export AS="${HOST}-as" diff --git a/cook.sh b/cook.sh index aa1c03a0d6dc1cc81ed175909fad76e8cb658df5..f66e4f93b9122652ea725cfb4da8a96cb4cb5488 100755 --- a/cook.sh +++ b/cook.sh @@ -235,7 +235,6 @@ function op { if [ "$skip" -eq "0" ] then - cp -p "$ROOT/Xargo.toml" "Xargo.toml" "${CARGO[@]}" "$CARGOBUILD" --target "$TARGET" $release_flag $package_flag $CARGOFLAGS fi popd > /dev/null diff --git a/recipes/block_encrypt/recipe.sh b/recipes/block_encrypt/recipe.sh deleted file mode 100644 index e698ea4ae31cd1e004093089c4a35553a9378b6b..0000000000000000000000000000000000000000 --- a/recipes/block_encrypt/recipe.sh +++ /dev/null @@ -1,3 +0,0 @@ -GIT=https://github.com/tomasritter/block_encrypt.git -CARGO=(env RUSTFLAGS="$PREFIX_RUSTFLAGS -C target-feature=+aes" xargo) - diff --git a/recipes/kernel/recipe.toml b/recipes/kernel/recipe.toml index 03d037bd334b9a805ffbe75bb7a5f0600bc55b81..9ab96b280863b7623d79345de2b3767dec3151a8 100644 --- a/recipes/kernel/recipe.toml +++ b/recipes/kernel/recipe.toml @@ -1,5 +1,5 @@ -[source] -git = "https://gitlab.redox-os.org/redox-os/kernel.git" +#[source] +#git = "https://gitlab.redox-os.org/redox-os/kernel.git" [build] template = "custom" diff --git a/recipes/relibc-tests/recipe.sh b/recipes/relibc-tests/recipe.sh index 4ec0a3d9cfd9443afc5f83af3ca9902ebb889c3f..dc39853b3d7c0b4a44d5fa952bc67d713392d134 100644 --- a/recipes/relibc-tests/recipe.sh +++ b/recipes/relibc-tests/recipe.sh @@ -1,7 +1,7 @@ GIT=https://gitlab.redox-os.org/redox-os/relibc.git function recipe_build { - "$REDOX_MAKE" CARGO=xargo NATIVE_RELIBC=1 -C tests -j"$($NPROC)" + "$REDOX_MAKE" NATIVE_RELIBC=1 -C tests -j"$($NPROC)" skip=1 } diff --git a/recipes/rust-cairo-demo/recipe.sh b/recipes/rust-cairo-demo/recipe.sh index 13e373e65cc8c48e4b3893ee0d9ddbfbc449bd13..2b493d1ff2d5a3cfc4d170f86f887471ef45f767 100644 --- a/recipes/rust-cairo-demo/recipe.sh +++ b/recipes/rust-cairo-demo/recipe.sh @@ -3,7 +3,6 @@ BUILD_DEPENDS=(cairo expat fontconfig freetype libpng pixman zlib) function recipe_build { sysroot="$(realpath ../sysroot)" - cp -p "$ROOT/Xargo.toml" "Xargo.toml" cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \ -- \ -L "${sysroot}/lib" \ diff --git a/recipes/rust-cairo/recipe.sh b/recipes/rust-cairo/recipe.sh index b4484639892d03e91f40cab53f63e297368930e1..a9a5725fa7324eae78caf657942689003e7e3a37 100644 --- a/recipes/rust-cairo/recipe.sh +++ b/recipes/rust-cairo/recipe.sh @@ -4,7 +4,6 @@ CARGOFLAGS="--example gui" function recipe_build { sysroot="$(realpath ../sysroot)" - cp -p "$ROOT/Xargo.toml" "Xargo.toml" cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \ -- \ -L "${sysroot}/lib" \ diff --git a/setup.sh b/setup.sh index bb8e5218e02948498e10e147946c30de3a9c21d6..25b6377a368596323411a300785f66fcd531300a 100755 --- a/setup.sh +++ b/setup.sh @@ -16,10 +16,5 @@ then echo "Installing cargo-config" cargo install -f cargo-config fi -if [ -z "$(which xargo)" ] -then - echo "Installing xargo" - cargo install -f xargo -fi echo "cook.sh is ready to use"