Clifford Wolf:

package/base/gcc/gcc.conf

@@ -301,22 +301,44 @@ custmain() {
 
 	# Inject our default optimisation options so when the user calls
 	# gcc/g++ they match the ones used to precompile the headers ...
+	# Save the options affectioning optimization only.
 	#
-	# Save the options affectioning optimization only - for injection into the specs
-	# file. They should be the gcc default options since they match the ones used
-	# to generate the PCHs. -ReneR
-	#
-	# Ideas for simplifications welcome ...
-	#
-	echo "Adapting gcc specs file..."
-	cd $root/$prefix/lib/${gcc_lib_dir}
-	mv specs specs.orig
-        tr '\n' '@' < specs.orig | sed -e "s|@\\*cc1_options:@|@*cc1_options:@$(
-		eval echo \$GCC_WRAPPER_INSERT \$GCC_WRAPPER_APPEND \
-		\$GCC${ver:0:1}_WRAPPER_INSERT \$GCC${ver:0:1}_WRAPPER_APPEND | \
-		tr ' ' '\n' | sed -e '/-O./ { p; d; }' -e '/-mcpu=.*/ { p; d; }' \
-		-e '/-march=.*/ { p; d; }' -e '/-mtune=.*/ { p; d; }' -e 'd' | tr '\n' ' '
-	) |" | tr '@' '\n' > specs
+	if [ $ROCKCFG_DEFAULT_CC = $xpkg ]; then
+	  echo "Creating /etc/profile.d/gcc ..."
+	  {
+		echo "export CFLAGS_SIZE=\"$(echo $(
+			eval echo \$GCC_WRAPPER_INSERT \$GCC_WRAPPER_APPEND \
+			\$GCC${ver:0:1}_WRAPPER_INSERT \$GCC${ver:0:1}_WRAPPER_APPEND | \
+			tr ' ' '\n' | sed -e 's/^-SIZE-/-/' -e '/^-O/ { p; d; }' -e '/^-mcpu=/ { p; d; }' \
+			-e '/-march=/ { p; d; }' -e '/-mtune=/ { p; d; }' -e 'd'
+		))\""
+		echo "export CFLAGS_SPEED=\"$(echo $(
+			eval echo \$GCC_WRAPPER_INSERT \$GCC_WRAPPER_APPEND \
+			\$GCC${ver:0:1}_WRAPPER_INSERT \$GCC${ver:0:1}_WRAPPER_APPEND | \
+			tr ' ' '\n' | sed -e 's/^-SPEED-/-/' -e '/^-O/ { p; d; }' -e '/^-mcpu=/ { p; d; }' \
+			-e '/-march=/ { p; d; }' -e '/-mtune=/ { p; d; }' -e 'd'
+		))\""
+		echo "export CFLAGS=\"\$CFLAGS_SIZE\""
+	  } > $root/etc/profile.d/gcc
+	fi
+	if [ $ROCKCFG_DEFAULT_CXX = $xpkg ]; then
+	  echo "Creating /etc/profile.d/gxx ..."
+	  {
+		echo "export CXXFLAGS_SIZE=\"$(echo $(
+			eval echo \$GCC_WRAPPER_INSERT \$GCC_WRAPPER_APPEND \
+			\$GCC${ver:0:1}_WRAPPER_INSERT \$GCC${ver:0:1}_WRAPPER_APPEND | \
+			tr ' ' '\n' | sed -e 's/^-SIZE-/-/' -e '/^-O/ { p; d; }' -e '/^-mcpu=/ { p; d; }' \
+			-e '/-march=/ { p; d; }' -e '/-mtune=/ { p; d; }' -e 'd'
+		))\""
+		echo "export CXXFLAGS_SPEED=\"$(echo $(
+			eval echo \$GCC_WRAPPER_INSERT \$GCC_WRAPPER_APPEND \
+			\$GCC${ver:0:1}_WRAPPER_INSERT \$GCC${ver:0:1}_WRAPPER_APPEND | \
+			tr ' ' '\n' | sed -e 's/^-SPEED-/-/' -e '/^-O/ { p; d; }' -e '/^-mcpu=/ { p; d; }' \
+			-e '/-march=/ { p; d; }' -e '/-mtune=/ { p; d; }' -e 'd'
+		))\""
+		echo "export CXXFLAGS=\"\$CFLAGS_SIZE\""
+	  } > $root/etc/profile.d/gxx
+	fi
 
 	# Create symlinks for runtime libraries so they can be found by
 	# the dynamic loader and force rebuilding of the wrapper links