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

Merge pull request #64 from ids1024/pkg

Browse Source 
Use system 'pkg' when run on Redox
This commit is contained in:
Jeremy Soller 2017-08-11 15:08:25 -06:00 committed by GitHub
commit fc43b45ff3
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cook.sh
View File

@ -8,6 +8,13 @@ source config.sh
export BINDIR=bin
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 {
echo "cook.sh $1 <op>" >&2
echo " dist" >&2
@ -118,7 +125,7 @@ function op {
for i in "${BUILD_DEPENDS[@]}"
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
fi
@ -229,7 +236,7 @@ function op {
echo "target = \"$TARGET\"" >> "stage.toml"
mkdir -p stage/pkg
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)
rm -rfv stage.tar.gz stage.sig stage.toml