[GR-43614] Append sulong to LD_LIBRARY_PATH in the launcher

PullRequest: graalpython/2608

Author: otethal

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -687,6 +687,14 @@ protected void launch(Builder contextBuilder) {
                 evalInternal(context, "__graalpython__.startup_wall_clock_ts = " + startupWallClockTime + "; __graalpython__.startup_nano = " + startupNanoTime);
             }
 
+            // Set LD_LIBRARY_PATH so that binaries built with sulong toolchain can find libc++.so
+            evalInternal(context, """
+                            import os
+                            path = os.environ.get('LD_LIBRARY_PATH', '')
+                            sulong_path = os.pathsep.join(__graalpython__.get_toolchain_paths('LD_LIBRARY_PATH'))
+                            os.environ['LD_LIBRARY_PATH'] = path + os.pathsep + sulong_path if path else sulong_path
+                            """);
+
             if (!quietFlag && (verboseFlag || (commandString == null && inputFile == null && stdinIsInteractive))) {
                 print("Python " + evalInternal(context, "import sys; sys.version + ' on ' + sys.platform").asString());
                 if (!noSite) {

graalpython/lib-python/3/test/test_subprocess.py

@@ -788,6 +788,7 @@ def is_env_var_to_ignore(n):
                     n == 'LD_PRELOAD' or n.startswith('SANDBOX') or # Gentoo
                     n == 'PWD' or n == 'SHLVL' or # Graalpython bash launcher
                     n.startswith('JAVA_MAIN_CLASS') or # JVM on MacOS
+                    n == 'LD_LIBRARY_PATH' or # Added by graalpy launcher
                     n == 'LC_CTYPE') # Locale coercion triggered
 
         with subprocess.Popen([sys.executable, "-c",