From 73ae65560f9cad522d40b9b0b5e7246c077e3a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 31 Oct 2018 13:22:06 +0100 Subject: [PATCH] gcc: fix order of subpackages again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/gcc/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index f94a37eaefd..d5aacb2b2f8 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -65,11 +65,6 @@ if [ "$build_option_gnatboot" ]; then esac 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 subpackages+=" gcc-fortran libgfortran-devel libgfortran" if [ -z "$CROSS_BUILD" ]; then @@ -83,6 +78,11 @@ if [ "$CHROOT_READY" ]; then 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 i686) _triplet="i686-pc-linux-gnu";; i686-musl) _triplet="i686-linux-musl";;