diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index f6835bd53a0e..ba683a96fec3 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -464,7 +464,10 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
             command += cxxflag
         command += ' -c '
         command += file
-        return command.replace('-std=gnu++11', '-std=c++11')
+        # Help clang when the tree is configured for gcc.
+        for gnu in ('-std=gnu++11', '-std=gnu++1y'):
+            command = command.replace(gnu, '-std=c++11')
+        return command
 
 
 class KdevelopIntegrationGenerator(IdeIntegrationGenerator):