Merge branch 'master' into 'master'

Allow recipes that are Cargo workspaces to select individual packages,

See merge request redox-os/cookbook!224
This commit is contained in:
Jeremy Soller 2019-09-18 20:46:15 +00:00
commit b0d568c2e6

View File

@ -321,10 +321,16 @@ function op {
release_flag=
fi
if [ -n "$CARGO_PACKAGE" ]; then
package_flag="--package=$CARGO_PACKAGE"
else
package_flag=
fi
if [ "$skip" -eq "0" ]
then
cp -p "$ROOT/Xargo.toml" "Xargo.toml"
"${CARGO[@]}" "$CARGOBUILD" --target "$TARGET" $release_flag $CARGOFLAGS
"${CARGO[@]}" "$CARGOBUILD" --target "$TARGET" $release_flag $package_flag $CARGOFLAGS
fi
popd > /dev/null
;;