diff --git a/Makefile b/Makefile
index fa2acb282..26993020d 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ LDFLAGS = -Map ../../$(MAP)
 OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
 
 LIBGCC := tools/agbcc/lib/libgcc.a
+LIBC   := tools/agbcc/lib/libc.a
 
 LIBC := tools/agbcc/lib/libc.a
 
diff --git a/build_tools.sh b/build_tools.sh
index 26f1f35b3..f4656e2d8 100755
--- a/build_tools.sh
+++ b/build_tools.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-make -C tools/gbagfx
-make -C tools/scaninc
-make -C tools/preproc
-make -C tools/bin2c
-make -C tools/rsfont
-make -C tools/aif2pcm
-make -C tools/ramscrgen
+make -C tools/gbagfx CXX=${1:=g++}
+make -C tools/scaninc CXX=${1:=g++}
+make -C tools/preproc CXX=${1:=g++}
+make -C tools/bin2c CXX=${1:=g++}
+make -C tools/rsfont CXX=${1:=g++}
+make -C tools/aif2pcm CXX=${1:=g++}
+make -C tools/ramscrgen CXX=${1:=g++}