Skip to content

Normalize arch to universal-java-version #8883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
headius merged 1 commit into from
Jul 9, 2025
Merged

Normalize arch to universal-java-version #8883

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,13 @@ public void load(Ruby runtime, boolean wrap) {
setConfig(context, CONFIG, "TEENY", teeny);
setConfig(context, CONFIG, "PATCHLEVEL", "0");
setConfig(context, CONFIG, "ruby_version", major + '.' + minor + ".0");

// normalize Java version 1.8 to 8
String javaSpecVersion = System.getProperty("java.specification.version");
if (javaSpecVersion.equals("1.8")) javaSpecVersion = "8";

// Rubygems is too specific on host cpu so until we have real need lets default to universal
//setConfig(CONFIG, "arch", System.getProperty("os.arch") + "-java" + System.getProperty("java.specification.version"));
setConfig(context, CONFIG, "arch", "universal-java" + System.getProperty("java.specification.version"));
setConfig(context, CONFIG, "arch", "universal-java-" + javaSpecVersion);

// Use property for binDir if available, otherwise fall back to common bin default
String binDir = SafePropertyAccessor.getProperty("jruby.bindir");
Expand Down
Loading