diff --git a/build-windows.sh b/build-windows.sh
index d9f761925e..7409d3f839 100755
--- a/build-windows.sh
+++ b/build-windows.sh
@@ -140,7 +140,29 @@ function build_gcc() {
   mkdir -p "${base_dir}/build/gcc"
   pushd "${base_dir}/build/gcc"
 
-  "${base_dir}/src/gcc/configure" --prefix=${target_dir} --sysconfdir=${target_dir}/etc --enable-static --host=x86_64-w64-mingw32  --build=x86_64-linux-gnu --target=${target_arch} --with-sysroot=${target_dir}/${target_arch}/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --without-zstd --enable-libquadmath --enable-tls --enable-threads --with-arch=nocona --enable-languages=c,c++ --enable-shared --disable-libgomp --disable-libstdcxx --with-static-standard-libraries LDFLAGS="-lssp"
+  flags="$(${target_dir}/bin/${target_arch}-gcc -v 2>&1 | grep Configured\ with:)"
+  skip="prefix sysconfdir with-sysroot with-gmp with-mpc with-mpfr with-pkgversion with-bugurl with-isl with-build-time-tools"
+  newflags="--prefix=${target_dir} --sysconfdir=${target_dir}/etc --enable-static --host=x86_64-w64-mingw32  --build=x86_64-linux-gnu --with-sysroot=${target_dir}/${target_arch}/sysroot --with-static-standard-libraries"
+  
+  for flag in ${flags}; do
+    keep=1
+    if ! echo ${flag} | grep -qE '^--'; then
+      keep=0
+    fi
+  
+    for s in ${skip}; do
+      if echo ${flag} | grep -qE "^--${s}"; then
+        keep=0
+        break
+      fi
+    done
+  
+    if [ ${keep} -eq 1 ]; then
+      newflags="${newflags} ${flag}"
+    fi
+  done
+
+  "${base_dir}/src/gcc/configure" ${newflags} LDFLAGS="-lssp"
   make -j
   make install-strip
   popd
diff --git a/clean-linux-toolchain.sh b/clean-linux-toolchain.sh
index 7447dbdcfe..61261fcb82 100755
--- a/clean-linux-toolchain.sh
+++ b/clean-linux-toolchain.sh
@@ -88,8 +88,6 @@ if [ -L ${arch}/sysroot/usr/${libdir_to_keep} ]; then
   mv ${arch}/sysroot/usr/${libdir_to_keep}/pulseaudio ${arch}/sysroot/usr/${libdir_to_remove}
 fi
 
-find -name *python2* -exec rm -rf {} \; || true
-
 ln -s bin/gcc ${arch}-gcc
 ln -s bin/g++ ${arch}-g++
 ln -s bin/ar ${arch}-ar
@@ -97,3 +95,4 @@ ln -s bin/ranlib ${arch}-ranlib
 ln -s bin/gcc-ar ${arch}-gcc-ar
 ln -s bin/gcc-ranlib ${arch}-gcc-ranlib
 
+find -name *python2* -exec rm -rf {} \; || true