[GR-13273] Use the relative home property to specify where is the Sulong home for the standalone

PullRequest: truffleruby/529

Author: eregon

mx.truffleruby/native-image.properties

@@ -12,4 +12,5 @@ Args = -H:MaxRuntimeCompileMethods=5400 \
        -H:SubstitutionResources=org/truffleruby/aot/substitutions.json \
        -H:+AddAllCharsets
 
-JavaArgs = -Dpolyglot.engine.PreinitializeContexts=ruby
+JavaArgs = -Dpolyglot.engine.PreinitializeContexts=ruby \
+           -Dorg.graalvm.launcher.relative.llvm.home=../lib/cext/sulong-libs

mx.truffleruby/suite.py

@@ -9,7 +9,7 @@
                 "name": "tools",
                 "subdir": True,
                 # version must always be equal to the version of the "sulong" import below
-                "version": "46384f568d0ca577351b715bbefc31044c133bbf",
+                "version": "bb9e89f7219645e41fad6c0179bd2d7969a771a3",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -19,7 +19,7 @@
                 "name": "sulong",
                 "subdir": True,
                 # version must always be equal to the version of the "tools" import above
-                "version": "46384f568d0ca577351b715bbefc31044c133bbf",
+                "version": "bb9e89f7219645e41fad6c0179bd2d7969a771a3",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

src/launcher/java/org/truffleruby/launcher/RubyLauncher.java

@@ -24,7 +24,6 @@
 import org.truffleruby.shared.TruffleRuby;
 import org.truffleruby.shared.Metrics;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.reflect.Method;
@@ -112,20 +111,6 @@ protected List<String> preprocessArguments(List<String> args, Map<String, String
                 if (launcher != null) {
                     polyglotOptions.put(OptionsCatalog.LAUNCHER.getName(), launcher);
                 }
-
-                // In a native standalone distribution outside of GraalVM, we need to give the path to libsulong
-                if (!isGraalVMAvailable()) { // TODO (eregon, 9 Jan 2019): This should check if Sulong is available.
-                    final String rubyHome = new File(launcher).getParentFile().getParent();
-                    final String libSulongPath = rubyHome + "/lib/cext/sulong-libs";
-
-                    String libraryPath = System.getProperty("polyglot.llvm.libraryPath");
-                    if (libraryPath == null || libraryPath.isEmpty()) {
-                        libraryPath = libSulongPath;
-                    } else {
-                        libraryPath = libraryPath + ":" + libSulongPath;
-                    }
-                    polyglotOptions.put("llvm.libraryPath", libraryPath);
-                }
             }
 
         } catch (CommandLineException commandLineException) {