From aa9e0557ed3709504ec9000399f7b1fcf7328675 Mon Sep 17 00:00:00 2001 From: BELLIER Sacha Date: Tue, 29 Oct 2024 18:49:49 +0100 Subject: [PATCH] fix: avoid name collision with StreamFormat: May need to isolate streamformat toolchains --- .bazelrc | 10 +++++----- MODULE.bazel | 13 +++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.bazelrc b/.bazelrc index 7146748..78dc38a 100644 --- a/.bazelrc +++ b/.bazelrc @@ -7,8 +7,8 @@ common --verbose_failures test --test_output=errors # Winlibs -common:winlibs-gcc --extra_toolchains=@winlibs//:gcc-toolchain -common:winlibs-clang --extra_toolchains=@pthread-winlibs//:clang-toolchain +common:winlibs-gcc --extra_toolchains=@lecs-winlibs//:gcc-toolchain +common:winlibs-clang --extra_toolchains=@lecs-pthread-winlibs//:clang-toolchain # BuildBuddy common:linux --workspace_status_command=$(pwd)/.buildbuddy/workspace_status.sh @@ -23,6 +23,6 @@ common:buildbuddy --experimental_remote_cache_compression common:buildbuddy --jobs=50 common:buildbuddy --remote_instance_name=littleecs # -common:buildbuddy --extra_execution_platforms=@buildbuddy//:platform -common:buildbuddy --extra_toolchains=@buildbuddy//:gcc-toolchain -common:buildbuddy --platforms=@buildbuddy//:platform \ No newline at end of file +common:buildbuddy --extra_execution_platforms=@lecs-buildbuddy//:platform +common:buildbuddy --extra_toolchains=@lecs-buildbuddy//:gcc-toolchain +common:buildbuddy --platforms=@lecs-buildbuddy//:platform \ No newline at end of file diff --git a/MODULE.bazel b/MODULE.bazel index 60f7630..294fba7 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -26,16 +26,17 @@ git_override( commit = "1e08f8e0507b6b6b1f4416a9a22cf5c28beaba93", ) +# Technically no need for this since their are already defined in 'streamformat' winlibs_toolchain_extension = use_extension("@bazel_winlibs//:rules.bzl", "winlibs_toolchain_extension") inject_repo(winlibs_toolchain_extension, "platforms", "bazel_utilities") -winlibs_toolchain_extension.winlibs_toolchain(name = "winlibs") -winlibs_toolchain_extension.winlibs_toolchain(name = "pthread-winlibs", linklibs = [ "pthread" ]) -use_repo(winlibs_toolchain_extension, "winlibs") -use_repo(winlibs_toolchain_extension, "pthread-winlibs") +winlibs_toolchain_extension.winlibs_toolchain(name = "lecs-winlibs") +winlibs_toolchain_extension.winlibs_toolchain(name = "lecs-pthread-winlibs", linklibs = [ "pthread" ]) +use_repo(winlibs_toolchain_extension, "lecs-winlibs") +use_repo(winlibs_toolchain_extension, "lecs-pthread-winlibs") # register_toolchains("@winlibs//:clang-toolchain") buildbuddy_toolchain_extension = use_extension("@bazel_buildbuddy//:rules.bzl", "buildbuddy_toolchain_extension") inject_repo(buildbuddy_toolchain_extension, "platforms", "bazel_utilities") -buildbuddy_toolchain_extension.buildbuddy_toolchain(name = "buildbuddy") -use_repo(buildbuddy_toolchain_extension, "buildbuddy") +buildbuddy_toolchain_extension.buildbuddy_toolchain(name = "lecs-buildbuddy") +use_repo(buildbuddy_toolchain_extension, "lecs-buildbuddy") # register_toolchains("@buildbuddy//:gcc-toolchain")