Add nplb compiler check for all linux based platforms

youtube · Sep 12, 2024 · 7adc4d0 · 7adc4d0
1 parent 727a2b7
commit 7adc4d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/starboard/nplb/BUILD.gn b/starboard/nplb/BUILD.gn
@@ -303,7 +303,7 @@ target(gtest_target_type, "nplb") {
     "window_get_size_test.cc",
   ]
 
-  if (!is_android) {
+  if (is_linux) {
     # Android has a different clang version than linux.
     sources +=
         [ "//starboard/nplb/compiler_compliance/cpp_compiler_version_check.cc" ]

diff --git a/starboard/nplb/compiler_compliance/cpp_compiler_version_check.cc b/starboard/nplb/compiler_compliance/cpp_compiler_version_check.cc
@@ -14,15 +14,18 @@
 
 #include <iostream>
 
+#define COBALT_CLANG_ERROR_MSG "We compile above Starboard targets like Cobalt, Nplb with " \
+    "clang17 or higher. If you are building with a non-Cobalt " \
+    "provided toolchain you may run into this error. To fix this error" \
+    "build libnplb using the Evergreen toolchain : " \
+    "cobalt.dev/development/setup-raspi"
+
 #ifdef __clang__
 // Check Clang major version required for building Nplb tests.
 // Clang major version can be deduced from "clang_revision" in
 // starboard/build/config/clang.gni
-static_assert(
-    __clang_major__ >= 17,
-    "We compile above Starboard targets like Cobalt, Nplb  with "
-    "clang17 or higher. If you are building with a non-Cobalt "
-    "provided toolchain you may run into this error. To fix this error"
-    "build libnplb using the Evergreen toolchain : "
-    "cobalt.dev/development/setup-raspi");
+static_assert(__clang_major__ >= 17, COBALT_CLANG_ERROR_MSG);
+#else
+static_assert(false, COBALT_CLANG_ERROR_MSG);
 #endif  // __clang__
+#undef COBALT_CLANG_ERROR_MSG