Skip to content
Snippets Groups Projects
Unverified Commit c6c87761 authored by Ian Douglas Scott's avatar Ian Douglas Scott
Browse files

Use system 'pkg' when run on Redox

parent 8eba3003
No related branches found
No related tags found
1 merge request!64Use system 'pkg' when run on Redox
...@@ -8,6 +8,13 @@ source config.sh ...@@ -8,6 +8,13 @@ source config.sh
export BINDIR=bin export BINDIR=bin
export CARGOFLAGS= export CARGOFLAGS=
if [ ! "$(uname -s)" = "Redox" ]
then
function pkg {
CC=cc cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- $@
}
fi
function usage { function usage {
echo "cook.sh $1 <op>" >&2 echo "cook.sh $1 <op>" >&2
echo " dist" >&2 echo " dist" >&2
...@@ -118,7 +125,7 @@ function op { ...@@ -118,7 +125,7 @@ function op {
for i in "${BUILD_DEPENDS[@]}" for i in "${BUILD_DEPENDS[@]}"
do do
CC=cc cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- --target=$TARGET install --root sysroot "$REPO/$i.tar.gz" pkg --target=$TARGET install --root sysroot "$REPO/$i.tar.gz"
done done
fi fi
...@@ -229,7 +236,7 @@ function op { ...@@ -229,7 +236,7 @@ function op {
echo "target = \"$TARGET\"" >> "stage.toml" echo "target = \"$TARGET\"" >> "stage.toml"
mkdir -p stage/pkg mkdir -p stage/pkg
cp -v stage.toml "stage/pkg/$1.toml" cp -v stage.toml "stage/pkg/$1.toml"
CC=cc cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- --target=$TARGET create stage pkg --target=$TARGET create stage
;; ;;
untar) untar)
rm -rfv stage.tar.gz stage.sig stage.toml rm -rfv stage.tar.gz stage.sig stage.toml
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment