From f416d39bb80957b3ba870f97929cd374f5403a17 Mon Sep 17 00:00:00 2001 From: David Neto Date: Thu, 22 Dec 2022 08:13:40 -0500 Subject: [PATCH] Bazel: Use @platforms//os:windows instead of @build_tools//src/conditions:windows (#5042) Bazel has been changing its conventions for implementing conditions on target OS. Update to the latest recommendation. See https://bazel.build/extending/platforms Silences a deprecation warning. Fixes: #5037 --- build_defs.bzl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build_defs.bzl b/build_defs.bzl index a94a425268..3a69de5c7b 100644 --- a/build_defs.bzl +++ b/build_defs.bzl @@ -4,7 +4,9 @@ COMMON_COPTS = [ "-DSPIRV_CHECK_CONTEXT", "-DSPIRV_COLOR_TERMINAL", ] + select({ - "@bazel_tools//src/conditions:windows": [], + # On Windows, assume MSVC. + # C++14 is the default in VisualStudio 2017. + "@platforms//os:windows": [], "//conditions:default": [ "-DSPIRV_LINUX", "-DSPIRV_TIMER_ENABLED", @@ -27,7 +29,7 @@ COMMON_COPTS = [ TEST_COPTS = COMMON_COPTS + [ ] + select({ - "@bazel_tools//src/conditions:windows": [ + "@platforms//os:windows": [ # Disable C4503 "decorated name length exceeded" warning, # triggered by some heavily templated types. # We don't care much about that in test code.