Skip to content

Commit

Permalink
Use non-prebuild Java toolchain configuration
Browse files Browse the repository at this point in the history
On NixOS we cannot use the pre-built `ijar` and `singlejar` tools as they are not
statically build and fail to find the dynamic linker.

Fixes #278
  • Loading branch information
avdv committed Nov 23, 2023
1 parent c638024 commit a53f9c3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions toolchains/java/local_java_repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

"""Rules for importing and registering a local JDK."""

load(":default_java_toolchain.bzl", "default_java_toolchain")
load(":default_java_toolchain.bzl", "NONPREBUILT_TOOLCHAIN_CONFIGURATION", "default_java_toolchain")

def _detect_java_version(repository_ctx, java_bin):
properties_out = repository_ctx.execute([java_bin, "-XshowSettings:properties"]).stderr
Expand Down Expand Up @@ -99,10 +99,10 @@ def local_java_runtime(name, java_home, version, runtime_name = None, visibility
for version in range(8, int(version) + 1):
default_java_toolchain(
name = name + "_toolchain_java" + str(version),
configuration = NONPREBUILT_TOOLCHAIN_CONFIGURATION,
source_version = str(version),
target_version = str(version),
java_runtime = runtime_name,

exec_compatible_with = exec_compatible_with,
target_compatible_with = target_compatible_with,
)
Expand Down

0 comments on commit a53f9c3

Please sign in to comment.