Skip to content

Commit 21e39d0

Browse files
committed
Revert "Workaround mx_sdk_vm_ng issue with output roots"
* This reverts commit e0784f4. * The fix has been upstreamed.
1 parent a4ba079 commit 21e39d0

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
import mx_native
6161
import mx_unittest
6262
import mx_sdk
63-
import mx_sdk_vm_ng
6463
import mx_subst
6564
import mx_truffle
6665
import mx_graalpython_bisect
@@ -102,9 +101,6 @@ def get_boolean_env(name, default=False):
102101
LATEST_JAVA_HOME = {"JAVA_HOME": os.environ.get("LATEST_JAVA_HOME", mx.get_jdk().home)}
103102
RUNNING_ON_LATEST_JAVA = os.environ.get("LATEST_JAVA_HOME", os.environ.get("JAVA_HOME")) == mx.get_jdk().home
104103

105-
if not SUITE._output_root_includes_config():
106-
# Workaround bug in mx_sdk_vm_ng.JavaHomeDependency not being a project yet relying on the underlying get_output_root implementation
107-
mx_sdk_vm_ng.JavaHomeDependency.get_output_root = lambda s: os.path.join(s.get_output_base(), s.name)
108104

109105
# this environment variable is used by some of our maven projects and jbang integration to build against the unreleased master version during development
110106
os.environ["GRAALPY_VERSION"] = GRAAL_VERSION

0 commit comments

Comments
 (0)