summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2022-01-04 13:09:39 +0000
committerMatthias Clasen <mclasen@redhat.com>2022-01-04 13:09:39 +0000
commitd76379428de8785ce8c9f666e331633ce7098942 (patch)
tree4eea428da352df7f7ca348f5b2e8873e841f9350 /gtk
parent89dbf9cc81a93da7660dc27d6e72c07aad56cc2a (diff)
parent46509b6dd28c58ae8dd7e2c02a82a3ccb2751e88 (diff)
downloadgtk+-d76379428de8785ce8c9f666e331633ce7098942.tar.gz
Merge branch 'noexecstack' into 'main'
Make our stack noexec Closes #4598 See merge request GNOME/gtk!4330
Diffstat (limited to 'gtk')
-rw-r--r--gtk/meson.build2
1 files changed, 2 insertions, 0 deletions
diff --git a/gtk/meson.build b/gtk/meson.build
index 91aefe1b17..6ce2c18320 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -927,6 +927,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.
input : gtk_gresource,
output : 'gtkresources_blob.o',
command : [ld,
+ '-z', 'noexecstack',
'-r',
'-b','binary',
'@INPUT@',
@@ -937,6 +938,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.
input : gtk_resources_binary,
output : 'gtkresources_blob2.o',
command : [objcopy,
+ '--strip-all',
'--add-symbol','_gtk_resource_data=.data:0',
'@INPUT@',
'@OUTPUT@'])