gcc: fix order of subpackages again
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
parent
25f9517bf1
commit
73ae65560f
1 changed files with 5 additions and 5 deletions
|
@ -65,11 +65,6 @@ if [ "$build_option_gnatboot" ]; then
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
subpackages+=" libstdc++-devel libstdc++ libgcc-devel"
|
|
||||||
if [ "$build_option_gnatboot" -o "$build_option_ada" ]; then
|
|
||||||
subpackages+=" gcc-ada libada-devel libada"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$CHROOT_READY" ]; then
|
if [ "$CHROOT_READY" ]; then
|
||||||
subpackages+=" gcc-fortran libgfortran-devel libgfortran"
|
subpackages+=" gcc-fortran libgfortran-devel libgfortran"
|
||||||
if [ -z "$CROSS_BUILD" ]; then
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
|
@ -83,6 +78,11 @@ if [ "$CHROOT_READY" ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
subpackages+=" libstdc++-devel libstdc++ libgcc-devel"
|
||||||
|
if [ "$build_option_gnatboot" -o "$build_option_ada" ]; then
|
||||||
|
subpackages+=" gcc-ada libada-devel libada"
|
||||||
|
fi
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
i686) _triplet="i686-pc-linux-gnu";;
|
i686) _triplet="i686-pc-linux-gnu";;
|
||||||
i686-musl) _triplet="i686-linux-musl";;
|
i686-musl) _triplet="i686-linux-musl";;
|
||||||
|
|
Loading…
Reference in a new issue