diff --git a/conf/Makefile.arm-linux-toolchain b/conf/Makefile.arm-linux-toolchain
index b956ec8dfb..7e623602be 100644
--- a/conf/Makefile.arm-linux-toolchain
+++ b/conf/Makefile.arm-linux-toolchain
@@ -37,7 +37,8 @@ ifeq ($(shell which $(PREFIX)-gcc),)
 endif
 
 CC   = $(PREFIX)-gcc
-LD   = $(PREFIX)-gcc
+CXX  = $(PREFIX)-g++
+LD   = $(PREFIX)-g++
 AR   = $(PREFIX)-ar
 CP   = $(PREFIX)-objcopy
 DMP  = $(PREFIX)-objdump