Skip to content

Commit

Permalink
* Make default config not use clang via llvm_toolchain.
Browse files Browse the repository at this point in the history
* Downgrade llv_toolchain (and thus also llvm -> 17.0.4).
  • Loading branch information
helly25 committed Mar 24, 2024
1 parent c28ef6c commit da03b31
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ build:asan --test_tag_filters=-no_san # skip san targets
build:asan --define san=true # skip san targets
build:asan --features=asan # https://github.com/bazelbuild/bazel/issues/6932

build --noincompatible_enable_cc_toolchain_resolution

build:clang --incompatible_enable_cc_toolchain_resolution
build:clang --cxxopt=-gmlt
build:clang --host_cxxopt=-gmlt
14 changes: 7 additions & 7 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ mbo_workspace_load_modules()

###########################################################################

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

###########################################################################

load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")

rules_foreign_cc_dependencies()
Expand All @@ -35,7 +41,7 @@ load("@toolchains_llvm//toolchain:rules.bzl", "llvm_toolchain")
llvm_toolchain(
name = "llvm_toolchain",
llvm_versions = {
"": "17.0.6",
"": "17.0.4",
"darwin-x86_64": "15.0.7", # For Intel based macs.
},
)
Expand All @@ -46,12 +52,6 @@ llvm_register_toolchains()

###########################################################################

#load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

#bazel_skylib_workspace()

###########################################################################

# Run: ./compile_commands-update.sh
load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")

Expand Down
4 changes: 2 additions & 2 deletions workspace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def mbo_workspace_load_modules():

github_archive(
name = "toolchains_llvm",
commit = "aa779570ae8ab4cc77c8ad5d823be6707f4b1f93",
commit = "ade23e0e37c5308162c012a4f4224459c1c4fa22",
repo = "https://github.com/bazel-contrib/toolchains_llvm",
sha256 = "6bee8d99a22b9c1b872c383a50ffc14efaa88cab1afcbe6f612916120ea3e761",
sha256 = "c3764286d31738c3ee73397568272ddf71f1dbd443998920358fd797022d747f",
)

0 comments on commit da03b31

Please sign in to comment.