Skip to content

Commit

Permalink
Fix cmake toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
rnburn authored and Johannes Tax committed Jul 7, 2020
1 parent e5596d8 commit fe208d1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
3 changes: 2 additions & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ http_archive(
load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")

rules_foreign_cc_dependencies([
"//bazel:built_cmake_toolchain",
"//bazel:built_cmake_toolchain_osx",
"//bazel:built_ninja_toolchain_osx",
"//bazel:built_cmake_toolchain_linux",
"//bazel:built_ninja_toolchain_linux",
])

Expand Down
12 changes: 11 additions & 1 deletion bazel/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ config_setting(
)

toolchain(
name = "built_cmake_toolchain",
name = "built_cmake_toolchain_osx",
exec_compatible_with = [
"@bazel_tools//platforms:osx",
"@bazel_tools//platforms:x86_64",
Expand All @@ -25,6 +25,16 @@ toolchain(
toolchain_type = "@rules_foreign_cc//tools/build_defs:ninja_toolchain",
)

toolchain(
name = "built_cmake_toolchain_linux",
exec_compatible_with = [
"@bazel_tools//platforms:linux",
"@bazel_tools//platforms:x86_64",
],
toolchain = "@rules_foreign_cc//tools/build_defs/native_tools:built_cmake",
toolchain_type = "@rules_foreign_cc//tools/build_defs:cmake_toolchain",
)

toolchain(
name = "built_ninja_toolchain_linux",
exec_compatible_with = [
Expand Down

0 comments on commit fe208d1

Please sign in to comment.