[GR-71846] Enabling GraalPy on GraalOS.

PullRequest: graalpython/4126

Author: zslajchrt

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

@@ -984,11 +984,16 @@ private void findAndApplyVenvCfg(Builder contextBuilder, String executable) {
                             }
                             if (Files.exists(baseExecutable)) {
                                 contextBuilder.option("python.BaseExecutable", baseExecutable.toString());
-                                /*
-                                 * This is needed to support the legacy GraalVM layout where the
-                                 * executable is a symlink into the 'languages' directory.
-                                 */
-                                contextBuilder.option("python.PythonHome", baseExecutable.getParent().getParent().toString());
+                                if ("/app".equals(baseExecutable.toString())) {
+                                    // GraalOS case
+                                    contextBuilder.option("python.PythonHome", "/");
+                                } else {
+                                    /*
+                                     * This is needed to support the legacy GraalVM layout where the
+                                     * executable is a symlink into the 'languages' directory.
+                                     */
+                                    contextBuilder.option("python.PythonHome", baseExecutable.getParent().getParent().toString());
+                                }
                             }
                         } catch (NullPointerException | InvalidPathException ex) {
                             // NullPointerException covers the possible null result of getParent()

scripts/generate-fsmappings.sh

@@ -93,17 +93,17 @@ cat <<EOF>> $OUTFILE
         {
             "concrete": "${MUSL_TOOLCHAIN}/lib/libc++.so.1.0",
             "verif": true,
-            "virt": "/proc/lib/libc++.so.1.0"
+            "virt": "/lib/libc++.so.1.0"
         },
         {
             "concrete": "${MUSL_TOOLCHAIN}/lib/libc++abi.so.1.0",
             "verif": true,
-            "virt": "/proc/lib/libc++abi.so.1.0"
+            "virt": "/lib/libc++abi.so.1.0"
         },
         {
             "concrete": "${MUSL_TOOLCHAIN}/lib/libunwind.so.1.0",
             "verif": true,
-            "virt": "/proc/lib/libunwind.so.1.0"
+            "virt": "/lib/libunwind.so.1.0"
         }
     ]
 }