Skip to content

Commit 5810f42

Browse files
authored
Merge pull request #510 from Earlopain/remove-rust-check
Remove `.rust.version` check
2 parents f9aaeea + 1630a46 commit 5810f42

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

Dockerfile.template

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ RUN set -eux; \
113113
{{ ) else "" end -}}
114114
; \
115115
{{ ) end -}}
116-
{{ if .rust.version then ( -}}
117116
\
118117
rustArch=; \
119118
{{ def archVar: if is_alpine then "apkArch" else "dpkgArch" end -}}
@@ -181,7 +180,6 @@ RUN set -eux; \
181180
rustc --version; \
182181
cargo --version; \
183182
fi; \
184-
{{ ) else "" end -}}
185183
\
186184
wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
187185
echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
@@ -208,16 +206,12 @@ RUN set -eux; \
208206
--build="$gnuArch" \
209207
--disable-install-doc \
210208
--enable-shared \
211-
{{ if .rust.version then ( -}}
212209
${rustArch:+--enable-yjit} \
213-
{{ ) else "" end -}}
214210
; \
215211
make -j "$(nproc)"; \
216212
make install; \
217213
\
218-
{{ if .rust.version then ( -}}
219214
rm -rf /tmp/rust; \
220-
{{ ) else "" end -}}
221215
{{ if is_alpine then ( -}}
222216
runDeps="$( \
223217
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \

0 commit comments

Comments
 (0)