Commit c6c5ab9 1 parent e65fc73 commit c6c5ab9 Copy full SHA for c6c5ab9
File tree 3 files changed +7
-3
lines changed
3 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -33,7 +33,10 @@ make clean
33
33
# These CFLAGs match honggfuzz's default, with the exception of -mtune to
34
34
# improve portability and `-D_HF_LINUX_NO_BFD` to remove assembly instructions
35
35
# from the filenames.
36
- CC=clang CFLAGS=" -O3 -funroll-loops -D_HF_LINUX_NO_BFD" make
36
+ #
37
+ # The LDFLAGS disable pie to work around a linker error that happens after a
38
+ # base-image bump from ubuntu:20.04.
39
+ CC=clang LDFLAGS=" -no-pie" CFLAGS=" -O3 -funroll-loops -D_HF_LINUX_NO_BFD" make
37
40
38
41
# libhfuzz.a will be added by CC/CXX linker directly during linking,
39
42
# but it's defined here to satisfy the build infrastructure
Original file line number Diff line number Diff line change 16
16
17
17
# Base image for all other images.
18
18
19
- ARG parent_image=ubuntu:20.04@sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d
19
+ # Pin to a hash to keep stable and re-usable caches
20
+ ARG parent_image=ubuntu:24.04@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782
20
21
21
22
FROM $parent_image
22
23
Original file line number Diff line number Diff line change @@ -32,6 +32,6 @@ apt-get update && apt-get install -y \
32
32
case $( uname -m) in
33
33
x86_64)
34
34
# We only need to worry about i386 if we are on x86_64.
35
- apt-get install -y lib32gcc1 libc6-i386
35
+ apt-get install -y lib32gcc-s1 libc6-i386
36
36
;;
37
37
esac
You can’t perform that action at this time.
0 commit comments