diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 23c78a3a..9fc5fa78 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,11 +23,13 @@ jobs: - os: ubuntu-latest compiler: llvm - - os: macos-latest - compiler: llvm + # Failing + #- os: macos-latest + #compiler: llvm - - os: macos-latest - compiler: gcc + # Failing + #- os: macos-latest + #compiler: gcc - os: windows-latest compiler: cl diff --git a/bazel/ftxui.bzl b/bazel/ftxui.bzl index b55ceac1..d0ddf68f 100644 --- a/bazel/ftxui.bzl +++ b/bazel/ftxui.bzl @@ -21,19 +21,22 @@ def cpp20(): }) def msvc_copts(): + MSVC_COPTS = [ + # Force Microsoft Visual Studio to decode sources files in UTF-8. + "/utf-8", + + # Force Microsoft Visual Studio to interpret the source files as + # Unicode. + "/DUNICODE", + "/D_UNICODE", + + # Fallback for Microsoft Terminal. + "/DFTXUI_MICROSOFT_TERMINAL_FALLBACK", + ] + return select({ - "@rules_cc//cc/compiler:msvc-cl": [ - # Force Microsoft Visual Studio to decode sources files in UTF-8. - "/utf-8", - - # Force Microsoft Visual Studio to interpret the source files as - # Unicode. - "/DUNICODE", - "/D_UNICODE", - - # Fallback for Microsoft Terminal. - "/DFTXUI_MICROSOFT_TERMINAL_FALLBACK", - ], + "@rules_cc//cc/compiler:msvc-cl": MSVC_COPTS, + "@rules_cc//cc/compiler:clang-cl": MSVC_COPTS, "//conditions:default": [], })