conflicts merged

2016-07-27 19:20:29 +02:00
parent e62c153ee1
commit bd4586fe01
6 changed files with 18 additions and 12 deletions
@@ -1,4 +1,5 @@
 gcc/5.1.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
 gcc/5.2.0	deprecated	b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
 gcc/5.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
+gcc/5.4.0	unstable	b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3

@@ -16,6 +16,7 @@ pbuild::configure() {
 		--with-mpc="${MPC_PREFIX}" \
 		--enable-lto \
 		--disable-multilib \
+		--with-build-config=bootstrap-debug \
 		--with-pkgversion="PSI Environment Module" \
 		--with-build-config=bootstrap-debug \
 		|| exit 1