From 696bca8521935cc1dba3ba9601187efe8bcac516 Mon Sep 17 00:00:00 2001
From: Steven Le Rouzic <steven.lerouzic@gmail.com>
Date: Sat, 17 Aug 2024 19:22:47 +0200
Subject: Fix Windows build

---
 .bazelrc        | 3 +++
 MODULE.bazel    | 9 ---------
 asl/utility.hpp | 6 ++----
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index d90900f..66c9547 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,3 +1,6 @@
+build:windows  --extra_execution_platforms=//:x64_windows-clang-cl
+build:windows  --extra_toolchains=@@local_config_cc//:cc-toolchain-x64_windows-clang-cl
+
 build:linux    --repo_env=CC=clang
 
 build:windows  --cxxopt=-Xclang=-std=c++20
diff --git a/MODULE.bazel b/MODULE.bazel
index 169d023..f60245c 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -6,12 +6,3 @@ git_override(
     remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
     commit = "a14ad3a64e7bf398ab48105aaa0348e032ac87f8",
 )
-
-register_execution_platforms(
-    # "//:x64_windows-clang-cl",
-)
-
-register_toolchains(
-    # "@@local_config_cc//:cc-toolchain-x64_windows-clang-cl",
-)
-
diff --git a/asl/utility.hpp b/asl/utility.hpp
index 33734a5..a94834d 100644
--- a/asl/utility.hpp
+++ b/asl/utility.hpp
@@ -1,12 +1,10 @@
 #pragma once
 
-#ifdef _MSVC_VER_
-#elif defined(__clang_version__)
-#else
+#ifndef __clang__
     #error Not a valid environment
 #endif
 
-#ifdef _MSVC_VER_
+#ifdef _MSC_VER
     #define ASL_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
 #else
     #define ASL_NO_UNIQUE_ADDRESS [[no_unique_address]]
-- 
cgit