From 7b95c47e64e30baaca03dd8a7f763219ba316f80 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 15 Jul 2021 02:05:21 +0200 Subject: [PATCH] Disable semantic interposition for build stages --- images/base-linux64/Dockerfile | 4 ++-- images/base-win32/Dockerfile | 4 +++- images/base-win64/Dockerfile | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/base-linux64/Dockerfile b/images/base-linux64/Dockerfile index f8e111b..ad41468 100644 --- a/images/base-linux64/Dockerfile +++ b/images/base-linux64/Dockerfile @@ -41,5 +41,5 @@ ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-ffbuild- CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" \ - STAGE_CFLAGS="-fvisibility=hidden" \ - STAGE_CXXFLAGS="-fvisibility=hidden" + STAGE_CFLAGS="-fvisibility=hidden -fno-semantic-interposition" \ + STAGE_CXXFLAGS="-fvisibility=hidden -fno-semantic-interposition" diff --git a/images/base-win32/Dockerfile b/images/base-win32/Dockerfile index 27cfd55..faae234 100644 --- a/images/base-win32/Dockerfile +++ b/images/base-win32/Dockerfile @@ -28,4 +28,6 @@ ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=i686-w64-mingw3 CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \ - DLLTOOL="i686-w64-mingw32-dlltool" + DLLTOOL="i686-w64-mingw32-dlltool" \ + STAGE_CFLAGS="-fno-semantic-interposition" \ + STAGE_CXXFLAGS="-fno-semantic-interposition" diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile index eb88849..75c6ae3 100644 --- a/images/base-win64/Dockerfile +++ b/images/base-win64/Dockerfile @@ -28,4 +28,6 @@ ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-ming CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \ - DLLTOOL="x86_64-w64-mingw32-dlltool" + DLLTOOL="x86_64-w64-mingw32-dlltool" \ + STAGE_CFLAGS="-fno-semantic-interposition" \ + STAGE_CXXFLAGS="-fno-semantic-interposition"