Remove all references to xargo

This commit is contained in:
Jeremy Soller 2023-02-21 11:52:50 -07:00
parent d63c62a70d
commit c619997825
No known key found for this signature in database
GPG Key ID: DCFCA852D3906975
10 changed files with 3 additions and 27 deletions

View File

@ -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

View File

@ -14,5 +14,3 @@ for recipe in $recipes
do
./cook.sh "$recipe" distclean
done
rm -rf xargo

View File

@ -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"

View File

@ -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

View File

@ -1,3 +0,0 @@
GIT=https://github.com/tomasritter/block_encrypt.git
CARGO=(env RUSTFLAGS="$PREFIX_RUSTFLAGS -C target-feature=+aes" xargo)

View File

@ -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"

View File

@ -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
}

View File

@ -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" \

View File

@ -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" \

View File

@ -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"