Skip to content

Commit 742fbe9

Browse files
committed
Fix download and extraction of NINJA_SYNTAX
* With this Dockerfile: FROM oraclelinux:10 RUN dnf install git COPY . /mx ENV PATH=/mx:$PATH WORKDIR /mx RUN mx version RUN ls -la ~/.mx/cache/NINJA_SYNTAX* RUN ls -la ~/.mx/cache/NINJA_SYNTAX*/* RUN ls -la ~/.mx/cache/NINJA_SYNTAX*/*/* RUN mx path --download NINJA_SYNTAX RUN ls -la ~/.mx/cache/NINJA_SYNTAX* RUN ls -la ~/.mx/cache/NINJA_SYNTAX*/*/* * Before this commit it's clear that ~/.mx/cache/NINJA_SYNTAX*/*/* is empty and remains empty even after `mx path --download NINJA_SYNTAX`. * After this commit, NINJA_SYNTAX is downloaded as soon as NinjaProject.resolveDeps is called.
1 parent 9dfcc71 commit 742fbe9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/mx/_impl/mx_native.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ def _ninja_deps(cls): # pylint: disable=no-self-argument
683683
except ImportError:
684684
dep = mx.library('NINJA_SYNTAX')
685685
deps.append(dep)
686-
module_path = os.path.join(dep.get_path(False), f'ninja_syntax-{dep.version}')
686+
module_path = os.path.join(dep.get_path(True), f'ninja_syntax-{dep.version}')
687687
mx_util.ensure_dir_exists(module_path) # otherwise, import machinery will ignore it
688688
sys.path.append(module_path)
689689

0 commit comments

Comments
 (0)