File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -32,13 +32,18 @@ cd contrib/contrib-build
3232# Disable X11/xlib in FFmpeg to avoid runtime dependency on libX11
3333sed -i ' /--target-os=linux --enable-pic/a FFMPEGCONF += --disable-xlib --disable-libxcb --disable-libxcb-shm --disable-libxcb-xfixes --disable-libxcb-shape --disable-x86asm' ../src/ffmpeg/rules.mak
3434
35+ # VPX's configure uses the raw 'ld' linker for its toolchain link test.
36+ # When objects are compiled with -fsanitize=address, raw ld cannot resolve
37+ # the ASan runtime symbols, failing with "Toolchain is unable to link
38+ # executables". Fix: propagate sanitizer CFLAGS into LDFLAGS and override LD
39+ # to use the compiler driver (clang/CC), which automatically links the correct
40+ # sanitizer runtimes.
41+ sed -i ' s|VPX_LDFLAGS := $(LDFLAGS)|VPX_LDFLAGS = $(LDFLAGS) $(filter -fsanitize%,$(CFLAGS))|' ../src/vpx/rules.mak
42+ sed -i ' s|LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS)|LDFLAGS="$(VPX_LDFLAGS)" LD=$(CC) CROSS=$(VPX_CROSS)|' ../src/vpx/rules.mak
43+
3544make V=1 -j$( nproc) \
36- .libxml2 \
3745 .flac \
38- .theora \
39- .dav1d \
40- .vpx \
41- .mpg123 \
46+ .libxml2 \
4247 .ffmpeg
4348
4449cd ../../
@@ -56,6 +61,10 @@ unset AFL_NOOPT
5661# Build various contribs with instrumentation
5762cd contrib/contrib-build
5863make V=1 -j$( nproc) \
64+ .theora \
65+ .dav1d \
66+ .vpx \
67+ .mpg123 \
5968 .ebml \
6069 .matroska \
6170 .ogg \
You can’t perform that action at this time.
0 commit comments