diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 003316f58259..d6880d9f3087 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 2016-10-12  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* Makefile.in (SELFTEST_FLAGS): Add -nostdinc.
+
 	* Makefile.in (SELFTEST_FLAGS): New variable.
 	(s-selftest, selftest-gdb, selftest-valgrind): Use it.
 
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 02d0c4511aee..f1ff782f10bd 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1879,7 +1879,9 @@ rest.cross: specs
 
 # GCC's selftests.
 # Specify a dummy input file to placate the driver.
-SELFTEST_FLAGS = -x c /dev/null -S -fself-test
+# Specify -nostdinc to work around missing WIND_BASE environment variable
+# required for *-wrs-vxworks-* targets.
+SELFTEST_FLAGS = -nostdinc -x c /dev/null -S -fself-test
 
 # Run the selftests during the build once we have a driver and a cc1,
 # so that self-test failures are caught as early as possible.