[GR-19453] Make sure libc++ is found when C extension libraries are used with FFI.

PullRequest: truffleruby/1131

Author: eregon

ci.jsonnet

@@ -206,7 +206,7 @@ local part_definitions = {
         JAVA_HOME: {
           name: "oraclejdk",
           # Update the openjdk8 version too below when updating this one
-          version: "8u221-jvmci-19.3-b02",
+          version: "8u231-jvmci-19.3-b04",
           platformspecific: true,
         },
       },
@@ -217,7 +217,7 @@ local part_definitions = {
       downloads+: {
         JAVA_HOME: {
           name: "openjdk",
-          version: "8u222-jvmci-19.3-b02",
+          version: "8u232-jvmci-19.3-b04",
           platformspecific: true,
         },
       },
@@ -227,7 +227,7 @@ local part_definitions = {
       downloads+: {
         JAVA_HOME: {
           name: "labsjdk",
-          version: "ce-11.0.5+9-jvmci-19.3-b03",
+          version: "ce-11.0.5+10-jvmci-19.3-b04",
           platformspecific: true,
         },
       },

lib/truffle/rbconfig-for-mkmf.rb

@@ -58,6 +58,11 @@
   warnflags << '-Werror' # Make sure there are no warnings in core C extensions
 else
   libtruffleruby = "#{cext_dir}/libtruffleruby.#{dlext}"
+
+  # GR-19453: workaround for finding libc++.so when using NFI on the library since the toolchain does not pass -rpath automatically
+  rpath_libcxx = " -rpath #{File.expand_path("../../lib", RbConfig::CONFIG['CC'])}"
+  ldflags << rpath_libcxx
+  dldflags << rpath_libcxx
 end
 
 # Link to libtruffleruby by absolute path

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": "49904bd467719eb7f4d4c33d0f5f0546ef90844e",
+                "version": "ba52180a5c5d1b7e5a91267378383f64bc0ace89",
                 "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": "49904bd467719eb7f4d4c33d0f5f0546ef90844e",
+                "version": "ba52180a5c5d1b7e5a91267378383f64bc0ace89",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

tool/jt.rb

@@ -1891,7 +1891,7 @@ def checkout_enterprise_revision
     # Find the commit importing that version of graal in graal-enterprise by looking at the suite file.
     # The suite file is automatically updated on every graal PR merged.
     graal_enterprise_commit = raw_sh(
-        'git', '-C', ee_path, 'log', 'origin/master', '--pretty=%H', '--grep=PullRequest:', '--reverse', '-m',
+        'git', '-C', ee_path, 'log', 'origin/release/graal-vm/19.3', '--pretty=%H', '--grep=PullRequest:', '--reverse', '-m',
         '-S', merge_commit_in_graal, '--', suite_file, capture: true).lines.first.chomp
     raw_sh('git', '-C', ee_path, 'checkout', graal_enterprise_commit)
   end

tool/make-standalone-distribution.sh

@@ -9,23 +9,10 @@
 set -e
 set -x
 
-# Check platform
-case $(uname) in
-  Linux) os=linux ;;
-  Darwin) os=darwin ;;
-  *) echo "unknown platform $(uname)" 1>&2; exit 1 ;;
-esac
-
-# Check architecture
-case $(uname -m) in
-  x86_64) arch=amd64 ;;
-  *) echo "unknown architecture $(uname -m)" 1>&2; exit 1 ;;
-esac
-
 # Build
 tool/jt.rb build --env native
 
-release_home="$(cd ../graal/vm/mxbuild/$os-$arch/RUBY_STANDALONE_SVM*/* && pwd -P)"
+release_home=$(tool/jt.rb mx --env native standalone-home ruby)
 
 # Test the post-install hook
 TRUFFLERUBY_RECOMPILE_OPENSSL=true "$release_home/lib/truffle/post_install_hook.sh"