File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -118,7 +118,6 @@ RUN <<EOF
118118 locales \
119119 make \
120120 net-tools \
121- ninja-build \
122121 nodejs \
123122 npm \
124123 openssh-client \
@@ -246,14 +245,12 @@ EOF
246245ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH
247246
248247# Install Kitware ninja
249- # NOTE: Pre-built Kitware ninja binaries are only available for x86_64 host.
250248RUN <<EOF
251- if [ "${HOSTTYPE}" = "x86_64" ]; then
252- wget ${WGET_ARGS} https://github.com/Kitware/ninja/releases/download/v${KITWARE_NINJA_VERSION}/ninja-${KITWARE_NINJA_VERSION}_x86_64-linux-gnu.tar.gz
253- tar xf ninja-${KITWARE_NINJA_VERSION}_x86_64-linux-gnu.tar.gz -C /opt
254- ln -s /opt/ninja-${KITWARE_NINJA_VERSION}_x86_64-linux-gnu/ninja /usr/local/bin
255- rm ninja-${KITWARE_NINJA_VERSION}_x86_64-linux-gnu.tar.gz
256- fi
249+ NINJA_BASENAME=ninja-${KITWARE_NINJA_VERSION}_${HOSTTYPE}-linux-gnu
250+ wget ${WGET_ARGS} https://github.com/Kitware/ninja/releases/download/v${KITWARE_NINJA_VERSION}/${NINJA_BASENAME}.tar.gz
251+ tar xf ${NINJA_BASENAME}.tar.gz -C /opt
252+ ln -s /opt/${NINJA_BASENAME}/ninja /usr/local/bin
253+ rm ${NINJA_BASENAME}.tar.gz
257254EOF
258255
259256# Install ccache
You can’t perform that action at this time.
0 commit comments