Use new sulong home layout

Author: zapster

mx.truffleruby/suite.py

@@ -256,13 +256,13 @@
                 "TRUFFLERUBY", # We need this jar to run extconf.rb
                 "TRUFFLERUBY-LAUNCHER", # We need this jar to run extconf.rb
                 "truffle:TRUFFLE_NFI_NATIVE", # trufflenfi.h
-                "sulong:SULONG_LIBS", # polyglot.h
+                "sulong:SULONG_HOME", # polyglot.h
             ],
             "buildEnv": {
               "TRUFFLERUBYOPT": "--building-core-cexts",
               "NFI_HEADERS_DIR": "<path:truffle:TRUFFLE_NFI_NATIVE>/include",
-              "SULONG_HEADERS_DIR": "<path:SULONG_LIBS>",
-              "SULONG_POLYGLOT_H": "<path:SULONG_LIBS>/polyglot.h",
+              "SULONG_HEADERS_DIR": "<path:SULONG_HOME>/include",
+              "SULONG_POLYGLOT_H": "<path:SULONG_HOME>/include/polyglot.h",
             },
             "output": ".",
             "results": [
@@ -416,10 +416,10 @@
                 ],
                 "lib/cext/include/sulong/": [
                     "file:lib/cext/include/sulong/truffle.h",
-                    "extracted-dependency:sulong:SULONG_LIBS/*.h",
+                    "link:../../sulong-libs/include/polyglot.h",
                 ],
                 "lib/cext/sulong-libs/": [
-                    "extracted-dependency:sulong:SULONG_LIBS/*",
+                    "extracted-dependency:sulong:SULONG_HOME/*",
                 ],
                 "lib/mri/": [
                     "dependency:org.truffleruby.cext/src/main/c/etc/etc.su",