1 files changed, 8 insertions, 26 deletions
diff --git a/BUILD.bazel b/BUILD.bazel
index 34e4a54..003c1b9 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,8 +1,6 @@
 # Description:
 #   Brotli is a generic-purpose lossless compression algorithm.
 
-load(":compiler_config_setting.bzl", "create_msvc_config")
-
 package(
     default_visibility = ["//visibility:public"],
 )
@@ -12,37 +10,21 @@ licenses(["notice"])  # MIT
 exports_files(["LICENSE"])
 
 config_setting(
-    name = "darwin",
-    values = {"cpu": "darwin"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "darwin_x86_64",
-    values = {"cpu": "darwin_x86_64"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "windows",
-    values = {"cpu": "x64_windows"},
+    name = "clang-cl",
+    flag_values = {
+        "@bazel_tools//tools/cpp:compiler": "clang-cl",
+    },
     visibility = ["//visibility:public"],
 )
 
 config_setting(
-    name = "windows_msvc",
-    values = {"cpu": "x64_windows_msvc"},
+    name = "msvc",
+    flag_values = {
+        "@bazel_tools//tools/cpp:compiler": "msvc-cl",
+    },
     visibility = ["//visibility:public"],
 )
 
-config_setting(
-    name = "windows_msys",
-    values = {"cpu": "x64_windows_msys"},
-    visibility = ["//visibility:public"],
-)
-
-create_msvc_config()
-
 STRICT_C_OPTIONS = select({
     ":msvc": [],
     ":clang-cl": [