Skip to content

Commit 4b85031

Browse files
committed
Use packaged mold binary
1 parent 3f48b28 commit 4b85031

File tree

6 files changed

+3
-69
lines changed

6 files changed

+3
-69
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,7 @@ RUN groupmod --gid "$USER_GID" vscode \
66
&& chown -R "$USER_UID":"$USER_GID" /home/vscode \
77
&& apt-get update
88

9-
FROM base AS mold
10-
COPY build-context/mold.build-packages build-context/mold.url /tmp/
11-
RUN xargs -a /tmp/mold.build-packages apt-get -y install --no-install-recommends \
12-
&& rm /tmp/mold.build-packages
13-
USER vscode
14-
RUN mkdir ~/mold \
15-
&& cd ~/mold \
16-
&& xargs -a /tmp/mold.url curl -fsSL --proto '=https' --tlsv1.2 | tar xz --strip-components=1 \
17-
&& make -j$(nproc) \
18-
&& sudo make install
19-
20-
FROM base AS dev
9+
FROM base as dev
2110
COPY build-context/packages /tmp/
2211
RUN xargs -a /tmp/packages apt-get -y install --no-install-recommends \
2312
&& apt-get autoremove -y \
@@ -26,8 +15,4 @@ RUN xargs -a /tmp/packages apt-get -y install --no-install-recommends \
2615
USER vscode
2716
COPY build-context/Cargo.toml /tmp/
2817
RUN awk -F' = ' '/ = /{print $2 " " $1}' /tmp/Cargo.toml | xargs -n2 -P$(nproc) cargo install --locked --version \
29-
&& sudo rm -rf /tmp/Cargo.toml "$CARGO_HOME/registry" \
30-
# && rustup toolchain list | awk '{print $1}' | xargs rustup uninstall \
31-
&& sudo install -m 755 -d /usr/local/{bin,lib}/mold
32-
COPY --from=mold /usr/local/bin/mold /usr/local/bin/mold/ld
33-
COPY --from=mold /usr/local/lib/mold /usr/local/lib/mold/
18+
&& sudo rm -rf /tmp/Cargo.toml "$CARGO_HOME/registry"

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

Lines changed: 0 additions & 26 deletions
This file was deleted.

.devcontainer/build-context/mold.url

Lines changed: 0 additions & 1 deletion
This file was deleted.

.devcontainer/build-context/packages

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ libdw1=0.183-1
77
libipt2=2.0.3-1
88
libsource-highlight-common=3.1.9-3
99
libsource-highlight4v5=3.1.9-3+b1
10+
mold=1.10.1+dfsg-1
1011
valgrind=1:3.16.1-1
1112
valgrind-dbg=1:3.16.1-1

.devcontainer/update-scripts/latest-release-tarball.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

.devcontainer/update.sh

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,13 @@
33
set -eu
44

55
BUILD_CONTEXT="build-context"
6-
MOLD_GITHUB_REPO="rui314/mold"
7-
MOLD_TARBALL_URL="mold.url"
8-
MOLD_BUILD_DEPS="mold.build-packages"
96
PACKAGES="packages"
107

118
cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
129

1310
git config --global user.email "[email protected]"
1411
git config --global user.name "Update Bot"
1512

16-
(
17-
unlink "$BUILD_CONTEXT/$MOLD_BUILD_DEPS"
18-
update-scripts/latest-packages.sh > "$BUILD_CONTEXT/$MOLD_BUILD_DEPS"
19-
) < "$BUILD_CONTEXT/$MOLD_BUILD_DEPS"
20-
21-
git add -A
22-
git diff-index --quiet HEAD \
23-
|| git commit -qm 'Update mold build dependencies'
24-
25-
update-scripts/latest-release-tarball.sh "$MOLD_GITHUB_REPO" \
26-
> "$BUILD_CONTEXT/$MOLD_TARBALL_URL"
27-
28-
git add -A
29-
git diff-index --quiet HEAD \
30-
|| git commit -qm 'Update mold'
31-
3213
(
3314
unlink "$BUILD_CONTEXT/$PACKAGES"
3415
update-scripts/latest-packages.sh > "$BUILD_CONTEXT/$PACKAGES"

0 commit comments

Comments
 (0)