diff --git a/tools/build-posix64-toolchain.sh b/tools/build-posix64-toolchain.sh
index 406d413..18f7f35 100755
--- a/tools/build-posix64-toolchain.sh
+++ b/tools/build-posix64-toolchain.sh
@@ -131,6 +131,14 @@ if [ ! -f stamps/gcc-build ]; then
   touch stamps/gcc-build
 fi
 
+if [ ! -f stamps/libgcc-build ]; then
+  pushd gcc-build
+  make all-target-libgcc CFLAGS_FOR_TARGET='-g -O2 -mabi=32' -j${numproc}
+  popd
+
+  touch stamps/libgcc-build
+fi
+
 if [ ! -f stamps/gcc-install ]; then
   pushd gcc-build
   make install-gcc
@@ -145,6 +153,14 @@ if [ ! -f stamps/gcc-install ]; then
   touch stamps/gcc-install
 fi
 
+if [ ! -f stamps/libgcc-install ]; then
+  pushd gcc-build
+  make install-target-libgcc
+  popd
+
+  touch stamps/libgcc-install
+fi
+
 if [ ! -f stamps/make-download ]; then
   wget "${MAKE}" -O "tarballs/$(basename ${MAKE})"
   touch stamps/make-download
diff --git a/tools/build-win64-toolchain.sh b/tools/build-win64-toolchain.sh
index f2ec5ae..2ce3bbf 100755
--- a/tools/build-win64-toolchain.sh
+++ b/tools/build-win64-toolchain.sh
@@ -163,6 +163,14 @@ if [ ! -f stamps/gcc-build ]; then
   touch stamps/gcc-build
 fi
 
+if [ ! -f stamps/libgcc-build ]; then
+  pushd gcc-build
+  make all-target-libgcc CFLAGS_FOR_TARGET='-g -O2 -mabi=32'
+  popd
+
+  touch stamps/libgcc-build
+fi
+
 if [ ! -f stamps/gcc-install ]; then
   pushd gcc-build
   make install-gcc
@@ -176,6 +184,14 @@ if [ ! -f stamps/gcc-install ]; then
   touch stamps/gcc-install
 fi
 
+if [ ! -f stamps/libgcc-install ]; then
+  pushd gcc-build
+  make install-target-libgcc
+  popd
+
+  touch stamps/libgcc-install
+fi
+
 if [ ! -f stamps/make-download ]; then
   wget "${MAKE}" -O "tarballs/$(basename ${MAKE})"
   touch stamps/make-download