diff --git a/images/base-linux64/Dockerfile b/images/base-linux64/Dockerfile index a90962d..3fc7003 100644 --- a/images/base-linux64/Dockerfile +++ b/images/base-linux64/Dockerfile @@ -39,4 +39,4 @@ ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-ffbuild- PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig \ 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 -pthread -lm" + LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" diff --git a/images/base-win32/cross.meson b/images/base-win32/cross.meson index 453b603..5b99ce3 100644 --- a/images/base-win32/cross.meson +++ b/images/base-win32/cross.meson @@ -7,8 +7,6 @@ windres = 'i686-w64-mingw32-windres' exe_wrapper = ['wine'] [properties] -c_link_args = ['-static-libgcc', '-L/opt/ffbuild/lib', '-O2', '-pipe', '-fstack-protector-strong'] -cpp_link_args = ['-static-libgcc', '-static-libstdc++', '-L/opt/ffbuild/lib', '-O2', '-pipe', '-fstack-protector-strong'] needs_exe_wrapper = true [host_machine] diff --git a/images/base-win64/cross.meson b/images/base-win64/cross.meson index 7d596bd..f5743f0 100644 --- a/images/base-win64/cross.meson +++ b/images/base-win64/cross.meson @@ -7,8 +7,6 @@ windres = 'x86_64-w64-mingw32-windres' exe_wrapper = ['wine'] [properties] -c_link_args = ['-static-libgcc', '-L/opt/ffbuild/lib', '-O2', '-pipe', '-fstack-protector-strong'] -cpp_link_args = ['-static-libgcc', '-static-libstdc++', '-L/opt/ffbuild/lib', '-O2', '-pipe', '-fstack-protector-strong'] needs_exe_wrapper = true [host_machine]