diff --git a/include/toolchain/gcc.h b/include/toolchain/gcc.h
index cc2fdc7dc9b8b5..be056388ea017b 100644
--- a/include/toolchain/gcc.h
+++ b/include/toolchain/gcc.h
@@ -48,8 +48,9 @@
 #endif
 
 
+#undef BUILD_ASSERT /* clear out common version */
 /* C++11 has static_assert built in */
-#ifdef __cplusplus
+#if defined(__cplusplus) && (__cplusplus >= 201103L)
 #define BUILD_ASSERT(EXPR, MSG...) static_assert(EXPR, "" MSG)
 
 /*