Set sulong.LLVM=3.2 for now

tinchi · Jan 30, 2017 · 9f7a9a5 · 9f7a9a5
1 parent 9dd0e50
commit 9f7a9a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/doc/contributor/cexts.md b/doc/contributor/cexts.md
@@ -1,6 +1,7 @@
 # TruffleRuby, Sulong and C extensions
 
 TruffleRuby runs C extension using Sulong. You should build Sulong from source.
+Set `SULONG_VERSION=3.2` when building.
 
 https://github.com/graalvm/sulong
 

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -117,7 +117,6 @@ def self.find_graal_javacmd_and_options
         vm_args << '-cp'
         vm_args << [nfi_classes, sulong_dependencies, *sulong_jars].join(':')
         vm_args << '-XX:-UseJVMCIClassLoader'
-        vm_args << "-Dsulong.DynamicBitcodeLibraries=#{Dir.glob("#{graal_home}/mxbuild/projects/com.oracle.truffle.llvm.libraries/bin/*.bc").join(':')}"
       end
       options = []
     else
@@ -392,7 +391,7 @@ def llvm_opt(*args)
   end
 
   def sulong_run(*args)
-    mx_sulong 'su-run', *args
+    mx_sulong 'su-run', '-Dsulong.LLVM=3.2', *args
   end
 
   def sulong_link(*args)

diff --git a/truffleruby/src/main/java/org/truffleruby/language/loader/FeatureLoader.java b/truffleruby/src/main/java/org/truffleruby/language/loader/FeatureLoader.java
@@ -192,6 +192,8 @@ public void ensureCExtImplementationLoaded(VirtualFrame frame, String feature, I
                 throw new RaiseException(context.getCoreExceptions().loadError("Sulong is required to support C extensions, and it doesn't appear to be available", feature, null));
             }
 
+            System.setProperty("sulong.LLVM", "3.2");
+
             final CallTarget callTarget = getCExtLibRuby(feature);
             callNode.call(frame, callTarget, new Object[] {});