[RbConfig] RUBY_SO_NAME and RUBY_BASE_NAME

jruby · Feb 16, 2020 · eeb3f6f · eeb3f6f
1 parent 16ea5d2
commit eeb3f6f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java b/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
@@ -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());
@@ -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("i386")) ? "x32" : "x64") + "-msvcrt-" + jrubyScript());
+        } else {
+            setConfig(context, CONFIG, "RUBY_SO_NAME", "ruby");
+        }
 
         final String rubygemsDir = getRubygemsDir(runtime);
         if (rubygemsDir != null) {