[GR-48239] Do not set (DY)LD_LIBRARY_PATH if not running with LLVM.

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -50,6 +50,8 @@
 import static com.oracle.graal.python.nodes.StringLiterals.J_LLVM_LANGUAGE;
 import static com.oracle.graal.python.nodes.StringLiterals.T_COLON;
 import static com.oracle.graal.python.nodes.StringLiterals.T_EMPTY_STRING;
+import static com.oracle.graal.python.nodes.StringLiterals.T_LLVM_LANGUAGE;
+import static com.oracle.graal.python.nodes.StringLiterals.T_NATIVE;
 import static com.oracle.graal.python.nodes.StringLiterals.T_PATH;
 import static com.oracle.graal.python.nodes.StringLiterals.T_STRICT;
 import static com.oracle.graal.python.nodes.StringLiterals.T_SURROGATEESCAPE;
@@ -254,6 +256,7 @@ public void postInitialize(Python3Core core) {
         mod.setAttribute(tsLiteral("executable_list"), executableList);
         mod.setAttribute(tsLiteral("ForeignType"), core.lookupType(PythonBuiltinClassType.ForeignObject));
         mod.setAttribute(tsLiteral("use_system_toolchain"), context.getOption(PythonOptions.UseSystemToolchain));
+        mod.setAttribute(tsLiteral("ext_mode"), context.getOption(PythonOptions.NativeModules) ? T_NATIVE : T_LLVM_LANGUAGE);
 
         if (!context.getOption(PythonOptions.EnableDebuggingBuiltins)) {
             mod.setAttribute(tsLiteral("dump_truffle_ast"), PNone.NO_VALUE);

graalpython/lib-graalpython/sulong_support.py

@@ -38,13 +38,14 @@
 # SOFTWARE.
 
 # Set library search path so that binaries built with sulong toolchain can find libc++.so
-import os, sys
-if sys.platform == "linux":
-    var = "LD_LIBRARY_PATH"
-elif sys.platform == "darwin":
-    var = "DYLD_LIBRARY_PATH"
-elif sys.platform == "win32":
-    var = "PATH"
-path = os.environ.get(var, '')
-sulong_path = os.pathsep.join(__graalpython__.get_toolchain_paths('LD_LIBRARY_PATH'))
-os.environ[var] = f"{path}{os.pathsep}{sulong_path}" if path else sulong_path
+if __graalpython__.ext_mode == "llvm":
+    import os, sys
+    if sys.platform == "linux":
+        var = "LD_LIBRARY_PATH"
+    elif sys.platform == "darwin":
+        var = "DYLD_LIBRARY_PATH"
+    elif sys.platform == "win32":
+        var = "PATH"
+    path = os.environ.get(var, '')
+    sulong_path = os.pathsep.join(__graalpython__.get_toolchain_paths('LD_LIBRARY_PATH'))
+    os.environ[var] = f"{path}{os.pathsep}{sulong_path}" if path else sulong_path