gcc: changed to set locations of build prerequisites in all stages instead of toolchain stage only

base/gcc/gcc.conf

@@ -118,19 +118,7 @@ fi
 # only C and C++ by default, and on every stage
 languages="c,c++"
 
-if atstage toolchain; then
+# build prerequisites
-	bindir="/$prefix/crosscc"
-
-	var_append confopt " " "--with-sysroot=$sysroot"
-
-	var_append confopt " " "--program-prefix=${arch_target}-"
-	var_append confopt " " "--disable-cpp"
-	var_append confopt " " "--disable-shared"
-	var_append confopt " " "--disable-libssp"
-	var_append confopt " " "--disable-libgomp"
-	var_append confopt " " "--disable-libquadmath"
-
-	# use the native libraries we build in the toolchain directory
 var_append extraconfopt ' ' "--with-gmp=$( pkgprefix -r gmp )"
 var_append extraconfopt ' ' "--with-gmp-lib=$( pkgprefix -r libdir gmp )"
 var_append extraconfopt ' ' "--with-gmp-include=$( pkgprefix -r includedir gmp )"
@@ -146,6 +134,20 @@ if atstage toolchain; then
 var_append extraconfopt ' ' "--with-cloog=$( pkgprefix -r cloog )"
 var_append extraconfopt ' ' "--with-cloog-lib=$( pkgprefix -r libdir cloog )"
 var_append extraconfopt ' ' "--with-cloog-include=$( pkgprefix -r includedir cloog )"
+
+if atstage toolchain; then
+	bindir="/$prefix/crosscc"
+
+	var_append confopt " " "--with-sysroot=$sysroot"
+
+	var_append confopt " " "--program-prefix=${arch_target}-"
+	var_append confopt " " "--disable-cpp"
+	var_append confopt " " "--disable-shared"
+	var_append confopt " " "--disable-libssp"
+	var_append confopt " " "--disable-libgomp"
+	var_append confopt " " "--disable-libquadmath"
+
+	# use the native libraries we build in the toolchain directory
 	export LDFLAGS="-Wl,-rpath,${root}${libdir}"
 fi