Skip to content

Commit 6d30df2

Browse files
authored
[toolchains] Add native.toolchain arguments to define_kt_toolchain (#1213)
1 parent afceffb commit 6d30df2

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

docs/kotlin.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,8 @@ kt_plugin_cfg(<a href="#kt_plugin_cfg-name">name</a>, <a href="#kt_plugin_cfg-de
483483
define_kt_toolchain(<a href="#define_kt_toolchain-name">name</a>, <a href="#define_kt_toolchain-language_version">language_version</a>, <a href="#define_kt_toolchain-api_version">api_version</a>, <a href="#define_kt_toolchain-jvm_target">jvm_target</a>, <a href="#define_kt_toolchain-experimental_use_abi_jars">experimental_use_abi_jars</a>,
484484
<a href="#define_kt_toolchain-experimental_strict_kotlin_deps">experimental_strict_kotlin_deps</a>, <a href="#define_kt_toolchain-experimental_report_unused_deps">experimental_report_unused_deps</a>,
485485
<a href="#define_kt_toolchain-experimental_reduce_classpath_mode">experimental_reduce_classpath_mode</a>, <a href="#define_kt_toolchain-experimental_multiplex_workers">experimental_multiplex_workers</a>, <a href="#define_kt_toolchain-javac_options">javac_options</a>,
486-
<a href="#define_kt_toolchain-kotlinc_options">kotlinc_options</a>, <a href="#define_kt_toolchain-jacocorunner">jacocorunner</a>)
486+
<a href="#define_kt_toolchain-kotlinc_options">kotlinc_options</a>, <a href="#define_kt_toolchain-jacocorunner">jacocorunner</a>, <a href="#define_kt_toolchain-exec_compatible_with">exec_compatible_with</a>, <a href="#define_kt_toolchain-target_compatible_with">target_compatible_with</a>,
487+
<a href="#define_kt_toolchain-target_settings">target_settings</a>)
487488
</pre>
488489

489490
Define the Kotlin toolchain.
@@ -505,6 +506,9 @@ Define the Kotlin toolchain.
505506
| <a id="define_kt_toolchain-javac_options"></a>javac_options | <p align="center"> - </p> | <code>Label("//kotlin/internal:default_javac_options")</code> |
506507
| <a id="define_kt_toolchain-kotlinc_options"></a>kotlinc_options | <p align="center"> - </p> | <code>Label("//kotlin/internal:default_kotlinc_options")</code> |
507508
| <a id="define_kt_toolchain-jacocorunner"></a>jacocorunner | <p align="center"> - </p> | <code>None</code> |
509+
| <a id="define_kt_toolchain-exec_compatible_with"></a>exec_compatible_with | <p align="center"> - </p> | <code>None</code> |
510+
| <a id="define_kt_toolchain-target_compatible_with"></a>target_compatible_with | <p align="center"> - </p> | <code>None</code> |
511+
| <a id="define_kt_toolchain-target_settings"></a>target_settings | <p align="center"> - </p> | <code>None</code> |
508512

509513

510514
<a id="kt_register_toolchains"></a>

kotlin/internal/toolchains.bzl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,10 @@ def define_kt_toolchain(
301301
experimental_multiplex_workers = None,
302302
javac_options = Label("//kotlin/internal:default_javac_options"),
303303
kotlinc_options = Label("//kotlin/internal:default_kotlinc_options"),
304-
jacocorunner = None):
304+
jacocorunner = None,
305+
exec_compatible_with = None,
306+
target_compatible_with = None,
307+
target_settings = None):
305308
"""Define the Kotlin toolchain."""
306309
impl_name = name + "_impl"
307310

@@ -330,6 +333,9 @@ def define_kt_toolchain(
330333
toolchain_type = _TOOLCHAIN_TYPE,
331334
toolchain = impl_name,
332335
visibility = ["//visibility:public"],
336+
exec_compatible_with = exec_compatible_with or [],
337+
target_compatible_with = target_compatible_with or [],
338+
target_settings = target_settings or [],
333339
)
334340

335341
def kt_configure_toolchains():

scripts/generate_docs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
bazel build //kotlin:stardoc || fail "docs did not generate"
4+
5+
cp -f bazel-bin/kotlin/kotlin.md docs/ || fail "couldn't copy"

scripts/release.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ if test ! -d examples; then
4848
fi
4949

5050
# generate stardoc
51-
bazel build //kotlin:stardoc || fail "docs did not generate"
52-
53-
cp -f bazel-bin/kotlin/kotlin.md docs/ || fail "couldn't copy"
51+
source scripts/generate_docs
5452

5553
bazel test //...:all || fail "tests failed"
5654

0 commit comments

Comments
 (0)