Skip to content

Commit ec59919

Browse files
committed
Symlink correct asm directory on dist-various-2
We should symlink /usr/include/x86_64-linux-gnu/asm for the host triple, rather than /usr/include/asm-generic, which is used in the implementation for asm for specific triple, but shouldn't be used by itself.
1 parent 0d37c2b commit ec59919

File tree

1 file changed

+2
-2
lines changed
  • src/ci/docker/host-x86_64/dist-various-2

1 file changed

+2
-2
lines changed

src/ci/docker/host-x86_64/dist-various-2/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ ENV TARGETS=$TARGETS,x86_64-unknown-uefi
135135
# As per https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1300211
136136
# we need asm in the search path for gcc-9 (for gnux32) but not in the search path of the
137137
# cross compilers.
138-
# Luckily one of the folders is /usr/local/include so symlink /usr/include/asm-generic there
139-
RUN ln -s /usr/include/asm-generic /usr/local/include/asm
138+
# Luckily one of the folders is /usr/local/include so symlink /usr/include/x86_64-linux-gnu/asm there
139+
RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/local/include/asm
140140

141141
ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --disable-docs \
142142
--set target.wasm32-wasi.wasi-root=/wasm32-wasi \

0 commit comments

Comments
 (0)