Skip to content
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

Jump to bottom

[RbConfig] add RUBY_SO_NAME and RUBY_BASE_NAME #6063

Closed
wants to merge 2 commits into from
Closed

[RbConfig] add RUBY_SO_NAME and RUBY_BASE_NAME #6063

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57f6a5c
[RbConfig] RUBY_SO_NAME and RUBY_BASE_NAME
ahorek Feb 15, 2020
844554e
x32 build shouldnt contain a prefix
ahorek Feb 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 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 @@ -251,6 +251,7 @@ public void load(Ruby runtime, boolean wrap) {
setConfig(context, CONFIG, "bindir", binDir);

setConfig(context, CONFIG, "RUBY_INSTALL_NAME", jrubyScript());
setConfig(context, CONFIG, "RUBY_BASE_NAME", jrubyScript());
setConfig(context, CONFIG, "RUBYW_INSTALL_NAME", Platform.IS_WINDOWS ? "jrubyw.exe" : jrubyScript());
setConfig(context, CONFIG, "ruby_install_name", jrubyScript());
setConfig(context, CONFIG, "rubyw_install_name", Platform.IS_WINDOWS ? "jrubyw.exe" : jrubyScript());
Expand Down Expand Up @@ -332,6 +333,11 @@ public void load(Ruby runtime, boolean wrap) {
setConfig(context, CONFIG, "sysconfdir", sysConfDir);
setConfig(context, CONFIG, "localstatedir", newFile(normalizedHome, "var").getPath());
setConfig(context, CONFIG, "DLEXT", "jar");
if (Platform.IS_WINDOWS) {
setConfig(context, CONFIG, "RUBY_SO_NAME", ((arch.equals("x86_64")) ? "x64-" : "") + "msvcrt-" + jrubyScript());
} else {
setConfig(context, CONFIG, "RUBY_SO_NAME", "ruby");
}

final String rubygemsDir = getRubygemsDir(runtime);
if (rubygemsDir != null) {
Expand Down