diff --git a/BaseBuild/Basesys/gcc b/BaseBuild/Basesys/gcc
index 6e66696..ac46d60 100644
--- a/BaseBuild/Basesys/gcc
+++ b/BaseBuild/Basesys/gcc
@@ -83,12 +83,14 @@ mk() {
 	if [ "$MK64BIT" == "true" ]; then
 		ADDCONFIGURE="--libdir=/usr/lib64 --libexecdir=/usr/lib64"
 		RPATH="/lib64:/lib"
+		CCOPTIONS=""
 	else
 		ADDCONFIGURE="--libexecdir=/usr/lib"
 		RPATH="/lib"
+		CCOPTIONS="$BUILDOPTIONS"
 	fi
-	CC="gcc -Wl,-rpath-link,$RPATH -isystem /usr/include ${BUILDOPTIONS}" \
-	CXX="g++ -Wl,-rpath-link,$RPATH -isystem /usr/include ${BUILDOPTIONS}" \
+	CC="gcc -Wl,-rpath-link,$RPATH -isystem /usr/include ${CCOPTIONS}" \
+	CXX="g++ -Wl,-rpath-link,$RPATH -isystem /usr/include ${CCOPTIONS}" \
 	../gcc*/configure --prefix=/usr \
 		    	  $ADDCONFIGURE \
 		    	  --enable-shared \
diff --git a/BaseBuild/toolchain/gcc b/BaseBuild/toolchain/gcc
index 857077e..fcf0d65 100644
--- a/BaseBuild/toolchain/gcc
+++ b/BaseBuild/toolchain/gcc
@@ -96,9 +96,12 @@ premk() {
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
 		ADDCONFIGURE="--libdir=/tools/lib64"
+		CCOPTIONS=""
+	else
+		CCOPTIONS="$BUILDOPTIONS"
 	fi
-	CC="${CC} ${BUILDOPTIONS}" \
-	CXX="${CXX} ${BUILDOPTIONS}" \
+	CC="${CC} ${CCOPTIONS}" \
+	CXX="${CXX} ${CCOPTIONS}" \
 	../gcc*/configure --host=$TARGET \
 	            --target=$TARGET \
 		    --build=$HOSTSYS \