diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 85f24e1..4f6f58d 100755
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -494,7 +494,7 @@ function toolchain(_buildDir, _libDir)
 		}
 		buildoptions_cpp {
 			"-std=c++0x",
-		}		
+		}
 		links {
 			"rt",
 			"dl",
@@ -558,7 +558,6 @@ function toolchain(_buildDir, _libDir)
 		}
 		buildoptions {
 			"-fPIC",
-			"-std=c++0x",
 			"-no-canonical-prefixes",
 			"-Wa,--noexecstack",
 			"-fstack-protector",
@@ -567,6 +566,9 @@ function toolchain(_buildDir, _libDir)
 			"-Wunused-value",
 			"-Wundef",
 		}
+		buildoptions_cpp {
+			"-std=c++0x",
+		}
 		linkoptions {
 			"-no-canonical-prefixes",
 			"-Wl,--no-undefined",
@@ -670,7 +672,6 @@ function toolchain(_buildDir, _libDir)
 
 	configuration { "nacl or nacl-arm or pnacl" }
 		buildoptions {
-			"-std=c++0x",
 			"-U__STRICT_ANSI__", -- strcasecmp, setenv, unsetenv,...
 			"-fno-stack-protector",
 			"-fdiagnostics-show-option",
@@ -679,6 +680,9 @@ function toolchain(_buildDir, _libDir)
 			"-Wunused-value",
 			"-Wundef",
 		}
+		buildoptions_cpp {
+			"-std=c++0x",
+		}
 		includedirs {
 			"$(NACL_SDK_ROOT)/include",
 			path.join(bxDir, "include/compat/nacl"),
@@ -831,11 +835,13 @@ function toolchain(_buildDir, _libDir)
 		libdirs { path.join(_libDir, "lib/qnx-arm") }
 --		includedirs { path.join(bxDir, "include/compat/qnx") }
 		buildoptions {
-			"-std=c++0x",
 			"-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0
 			"-Wunused-value",
 			"-Wundef",
 		}
+		buildoptions_cpp {
+			"-std=c++0x",
+		}
 
 	configuration { "rpi" }
 		targetdir (path.join(_buildDir, "rpi/bin"))