Unverified Commit 6608cd59 authored by Anant Sharma's avatar Anant Sharma Committed by GitHub
Browse files

fix: stage sccache off PATH to prevent meson auto detection (#6578)


Signed-off-by: default avatarAnant Sharma <anants@nvidia.com>
parent e325dd13
...@@ -130,16 +130,18 @@ RUN git clone --depth 1 --branch ${NIXL_GDRCOPY_REF} https://github.com/NVIDIA/g ...@@ -130,16 +130,18 @@ RUN git clone --depth 1 --branch ${NIXL_GDRCOPY_REF} https://github.com/NVIDIA/g
rpm -Uvh gdrcopy-*.el8.${ARCH_ALT}.rpm && \ rpm -Uvh gdrcopy-*.el8.${ARCH_ALT}.rpm && \
rpm -Uvh gdrcopy-devel-*.el8.noarch.rpm rpm -Uvh gdrcopy-devel-*.el8.noarch.rpm
# sccache binary is pre-installed in dynamo_base; # sccache binary is pre-installed in dynamo_base; stage it off-PATH so
# COPY it so the install call below skips the GitHub download. # Meson doesn't auto-detect it as a CUDA compiler launcher
# Wrapper scripts (sccache-cc, sccache-cxx) are created by use-sccache.sh install. # (https://github.com/mesonbuild/meson/issues/11118).
COPY --from=dynamo_base /usr/local/bin/sccache /usr/local/bin/sccache # When USE_SCCACHE=true the RUN below symlinks it onto PATH before install.
COPY --from=dynamo_base /usr/local/bin/sccache /opt/sccache/sccache
ARG USE_SCCACHE ARG USE_SCCACHE
ARG SCCACHE_BUCKET ARG SCCACHE_BUCKET
ARG SCCACHE_REGION ARG SCCACHE_REGION
COPY container/use-sccache.sh /tmp/use-sccache.sh COPY container/use-sccache.sh /tmp/use-sccache.sh
RUN if [ "$USE_SCCACHE" = "true" ]; then \ RUN if [ "$USE_SCCACHE" = "true" ]; then \
ln -s /opt/sccache/sccache /usr/local/bin/sccache && \
/tmp/use-sccache.sh install; \ /tmp/use-sccache.sh install; \
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment