Skip to content

Commit

Permalink
Enable toolchain transitions.
Browse files Browse the repository at this point in the history
  • Loading branch information
phst committed Oct 23, 2020
1 parent e964178 commit c7d53a8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ load("@bazel_skylib//lib:versions.bzl", "versions")

# Note that the versions library only works within a WORKSPACE file, see
# https://github.com/bazelbuild/bazel/issues/8305.
versions.check("3.0.0")
versions.check("3.4.0")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")

Expand Down
3 changes: 3 additions & 0 deletions elisp/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ also load each other. However, it’s often preferable to only have one
ensure that files get only loaded in their byte-compiled form.""",
provides = [EmacsLispInfo],
toolchains = [_TOOLCHAIN_TYPE],
incompatible_use_toolchain_transition = True,
implementation = _elisp_library_impl,
)

Expand Down Expand Up @@ -361,6 +362,7 @@ in batch mode.""",
"@bazel_tools//tools/cpp:toolchain_type",
_TOOLCHAIN_TYPE,
],
incompatible_use_toolchain_transition = True,
implementation = _elisp_binary_impl,
)

Expand Down Expand Up @@ -449,6 +451,7 @@ normally pass, but don’t work under coverage for some reason.""",
"@bazel_tools//tools/cpp:toolchain_type",
_TOOLCHAIN_TYPE,
],
incompatible_use_toolchain_transition = True,
implementation = _elisp_test_impl,
)

Expand Down
1 change: 1 addition & 0 deletions emacs/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ The resulting executable can be used to run the compiled Emacs.""",
executable = True,
fragments = ["cpp"],
toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
incompatible_use_toolchain_transition = True,
implementation = _emacs_binary_impl,
)

Expand Down

0 comments on commit c7d53a8

Please sign in to comment.