pass the sys prefix when creating a venv

timfel · timfel · commit 8d19acf12149 · 2019-02-08T10:55:41.000+01:00
diff --git a/graalpython/lib-python/3/venv/__init__.py b/graalpython/lib-python/3/venv/__init__.py
@@ -326,9 +326,10 @@ def replace_variables(self, text, context):
         # Truffle change: we need to set some extra options for the launcher to work
         text = text.replace(
             '__VENV_GRAAL_PYTHON_OPTIONS__',
-            "--python.CoreHome='%s' --python.StdLibHome='%s' --python.Executable='%s'" % (
+            "--python.CoreHome='%s' --python.StdLibHome='%s' --python.SysPrefix='%s' --python.Executable='%s'" % (
                 sys.graal_python_core_home,
                 sys.graal_python_stdlib_home,
+                sys.prefix,
                 context.env_exe,
             )
         )

Original file line number	Diff line number	Diff line change
`@@ -326,9 +326,10 @@ def replace_variables(self, text, context):`
`326`	`326`	`# Truffle change: we need to set some extra options for the launcher to work`
`327`	`327`	`text = text.replace(`
`328`	`328`	`'__VENV_GRAAL_PYTHON_OPTIONS__',`
`329`		`- "--python.CoreHome='%s' --python.StdLibHome='%s' --python.Executable='%s'" % (`
	`329`	`+ "--python.CoreHome='%s' --python.StdLibHome='%s' --python.SysPrefix='%s' --python.Executable='%s'" % (`
`330`	`330`	`sys.graal_python_core_home,`
`331`	`331`	`sys.graal_python_stdlib_home,`
	`332`	`+ sys.prefix,`
`332`	`333`	`context.env_exe,`
`333`	`334`	`)`
`334`	`335`	`)`