Use packaged mold binary

Author: eggyal

.devcontainer/Dockerfile

@@ -1,23 +1,10 @@
-FROM mcr.microsoft.com/vscode/devcontainers/rust:1-bullseye@sha256:7a4c4c8b4516b6360edcfe0e8eaefad01ac94542634504658e29b35f0b7ea600 AS base
+FROM mcr.microsoft.com/vscode/devcontainers/rust:1-bullseye@sha256:7a4c4c8b4516b6360edcfe0e8eaefad01ac94542634504658e29b35f0b7ea600 AS dev
 ARG USER_UID=1000
 ARG USER_GID="$USER_UID"
 RUN groupmod --gid "$USER_GID" vscode \
     && usermod --uid "$USER_UID" --gid "$USER_GID" vscode \
     && chown -R "$USER_UID":"$USER_GID" /home/vscode \
     && apt-get update
-
-FROM base AS mold
-COPY build-context/mold.build-packages build-context/mold.url /tmp/
-RUN xargs -a /tmp/mold.build-packages apt-get -y install --no-install-recommends \
-    && rm /tmp/mold.build-packages
-USER vscode
-RUN mkdir ~/mold \
-    && cd ~/mold \
-    && xargs -a /tmp/mold.url curl -fsSL --proto '=https' --tlsv1.2 | tar xz --strip-components=1 \
-    && make -j$(nproc) \
-    && sudo make install
-
-FROM base AS dev
 COPY build-context/packages /tmp/
 RUN xargs -a /tmp/packages apt-get -y install --no-install-recommends \
     && apt-get autoremove -y \
@@ -26,8 +13,4 @@ RUN xargs -a /tmp/packages apt-get -y install --no-install-recommends \
 USER vscode
 COPY build-context/Cargo.toml /tmp/
 RUN awk -F' = ' '/ = /{print $2 " " $1}' /tmp/Cargo.toml | xargs -n2 -P$(nproc) cargo install --locked --version \
-    && sudo rm -rf /tmp/Cargo.toml "$CARGO_HOME/registry" \
-    # && rustup toolchain list | awk '{print $1}' | xargs rustup uninstall \
-    && sudo install -m 755 -d /usr/local/{bin,lib}/mold
-COPY --from=mold /usr/local/bin/mold /usr/local/bin/mold/ld
-COPY --from=mold /usr/local/lib/mold /usr/local/lib/mold/
+    && sudo rm -rf /tmp/Cargo.toml "$CARGO_HOME/registry"

.devcontainer/build-context/mold.build-packages

@@ -7,5 +7,6 @@ libdw1=0.183-1
 libipt2=2.0.3-1
 libsource-highlight-common=3.1.9-3
 libsource-highlight4v5=3.1.9-3+b1
+mold=1.10.1+dfsg-1
 valgrind=1:3.16.1-1
 valgrind-dbg=1:3.16.1-1

.devcontainer/build-context/mold.url

@@ -3,32 +3,13 @@
 set -eu
 
 BUILD_CONTEXT="build-context"
-MOLD_GITHUB_REPO="rui314/mold"
-MOLD_TARBALL_URL="mold.url"
-MOLD_BUILD_DEPS="mold.build-packages"
 PACKAGES="packages"
 
 cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
 
 git config --global user.email "[email protected]"
 git config --global user.name "Update Bot"
 
-(
-    unlink "$BUILD_CONTEXT/$MOLD_BUILD_DEPS"
-    update-scripts/latest-packages.sh > "$BUILD_CONTEXT/$MOLD_BUILD_DEPS"
-) < "$BUILD_CONTEXT/$MOLD_BUILD_DEPS"
-
-git add -A
-git diff-index --quiet HEAD \
-    || git commit -qm 'Update mold build dependencies'
-
-update-scripts/latest-release-tarball.sh "$MOLD_GITHUB_REPO" \
-> "$BUILD_CONTEXT/$MOLD_TARBALL_URL"
-
-git add -A
-git diff-index --quiet HEAD \
-    || git commit -qm 'Update mold'
-
 (
     unlink "$BUILD_CONTEXT/$PACKAGES"
     update-scripts/latest-packages.sh > "$BUILD_CONTEXT/$PACKAGES"