Skip to content

Commit 9331207

Browse files
committed
Auto merge of #151536 - jakos-sec:fix-asan-target, r=<try>
Fix sanitizer target builds on CI try-job: dist-x86_64-linux
2 parents 9283d59 + c6441d8 commit 9331207

File tree

1 file changed

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

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ ENV TARGETS=$TARGETS,wasm32-wasip1
113113
ENV TARGETS=$TARGETS,wasm32-wasip1-threads
114114
ENV TARGETS=$TARGETS,wasm32-wasip2
115115
ENV TARGETS=$TARGETS,wasm32v1-none
116-
ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnuasan
117116
ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnux32
118117
ENV TARGETS=$TARGETS,x86_64-fortanix-unknown-sgx
119118
ENV TARGETS=$TARGETS,nvptx64-nvidia-cuda
@@ -126,6 +125,8 @@ ENV TARGETS=$TARGETS,i686-unknown-uefi
126125
ENV TARGETS=$TARGETS,x86_64-unknown-uefi
127126
ENV TARGETS=$TARGETS,riscv64gc-unknown-linux-musl
128127

128+
ENV TARGETS_SANITIZERS=x86_64-unknown-linux-gnuasan
129+
129130
# As per https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1300211
130131
# we need asm in the search path for gcc-9 (for gnux32) but not in the search path of the
131132
# cross compilers.
@@ -139,4 +140,4 @@ ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --enable-llvm-bitcode-lin
139140
--musl-root-armv7=/musl-armv7 \
140141
--musl-root-riscv64gc=/musl-riscv64gc
141142

142-
ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS
143+
ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS && python3 ../x.py dist --host='' --set build.sanitizers=true --target $TARGETS_SANITIZERS

0 commit comments

Comments
 (0)