diff --git a/tools/building.py b/tools/building.py
index 79c013527b..d855aaebdc 100644
--- a/tools/building.py
+++ b/tools/building.py
@@ -303,6 +303,11 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
             LINKCOMSTR = 'LINK $TARGET'
         )
 
+    # fix the linker for C++
+    if GetDepend('RT_USING_CPLUSPLUS'):
+        if env['LINK'].find('gcc') != -1:
+            env['LINK'] = env['LINK'].replace('gcc', 'g++')
+
     # we need to seperate the variant_dir for BSPs and the kernels. BSPs could
     # have their own components etc. If they point to the same folder, SCons
     # would find the wrong source code to compile.