[GR-27679] Fix references to deprecated libraries and headers.

PullRequest: truffleruby/2209

Author: rschatz

doc/contributor/cexts.md

@@ -123,7 +123,7 @@ not a `VALUE`.
 
 `polyglot_*` 
 
-See [polyglot.h](https://github.com/oracle/graal/blob/master/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include/polyglot.h) for documentation regarding the `polyglot_*` methods.
+See [polyglot.h](https://github.com/oracle/graal/blob/master/sulong/projects/com.oracle.truffle.llvm.libraries.graalvm.llvm/include/graalvm/llvm/polyglot.h) for documentation regarding the `polyglot_*` methods.
 
 
 ##### ValueWrapper Long Representation

lib/cext/include/truffleruby/truffleruby-pre.h

@@ -20,7 +20,7 @@ extern "C" {
 
 #define TRUFFLERUBY
 
-#include <polyglot.h>
+#include <graalvm/llvm/polyglot.h>
 
 #include <ctype.h> // isdigit
 

lib/truffle/rbconfig.rb

@@ -128,7 +128,7 @@ module RbConfig
 
   # Link to libtruffleruby by absolute path
   libtruffleruby_dir = File.dirname(libtruffleruby)
-  librubyarg = "-L#{libtruffleruby_dir} -rpath #{libtruffleruby_dir} -ltruffleruby -lpolyglot-mock"
+  librubyarg = "-L#{libtruffleruby_dir} -rpath #{libtruffleruby_dir} -ltruffleruby -lgraalvm-llvm"
 
   warnflags = warnflags.join(' ')
 

src/main/c/cext/extconf.rb

@@ -24,14 +24,14 @@ module Truffle::Platform
 $CFLAGS << " -DRUBY_EXPORT"
 
 # Do no link against libtruffleruby for libtruffleruby itself.
-# We still need libtruffleruby to link against libpolyglot-mock,
+# We still need libtruffleruby to link against libgraalvm-llvm,
 # otherwise linking fails with "Undefined symbols" on macOS.
 if Truffle::Platform.darwin?
   # Set the install_name of libtruffleruby on macOS, so C exts linking to it
   # will know they need to look at the rpath to find it.
-  $LIBRUBYARG = "-Wl,-install_name,@rpath/libtruffleruby.dylib -lpolyglot-mock"
+  $LIBRUBYARG = "-Wl,-install_name,@rpath/libtruffleruby.dylib -lgraalvm-llvm"
 else
-  $LIBRUBYARG = "-lpolyglot-mock"
+  $LIBRUBYARG = "-lgraalvm-llvm"
 end
 
 create_makefile('libtruffleruby')