about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-04-09 23:37:21 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2021-04-09 23:37:21 +0000
commit555497ccbe5f9909c85f55e49ab913bf8b6c5d3d (patch)
tree0c99fd5f57e57deca44a0e26ace53c143057c345
parentc1ee697ec2d8eb83c9a545cae20c75f1ee38fcf6 (diff)
downloaddnsfunnel-555497ccbe5f9909c85f55e49ab913bf8b6c5d3d.tar.gz
dnsfunnel-555497ccbe5f9909c85f55e49ab913bf8b6c5d3d.tar.xz
dnsfunnel-555497ccbe5f9909c85f55e49ab913bf8b6c5d3d.zip
Real noexecstack fix: make strip less greedy
-rw-r--r--Makefile4
-rwxr-xr-xconfigure1
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 94a820f..cd6c7f0 100644
--- a/Makefile
+++ b/Makefile
@@ -75,10 +75,10 @@ tgz: distclean
 
 strip: $(ALL_LIBS) $(ALL_BINS)
 ifneq ($(strip $(STATIC_LIBS)),)
-	exec $(STRIP) -x -R .note -R .comment -R .note.GNU-stack $(STATIC_LIBS)
+	exec $(STRIP) -x -R .note -R .comment $(STATIC_LIBS)
 endif
 ifneq ($(strip $(ALL_BINS)$(SHARED_LIBS)),)
-	exec $(STRIP) -R .note -R .comment -R .note.GNU-stack $(ALL_BINS) $(SHARED_LIBS)
+	exec $(STRIP) -R .note -R .comment $(ALL_BINS) $(SHARED_LIBS)
 endif
 
 install: install-dynlib install-libexec install-bin install-lib install-include
diff --git a/configure b/configure
index d51b4b6..8ef4cde 100755
--- a/configure
+++ b/configure
@@ -341,7 +341,6 @@ tryflag CFLAGS_AUTO -fdata-sections
 
 tryldflag LDFLAGS_AUTO -Wl,--sort-section=alignment
 tryldflag LDFLAGS_AUTO -Wl,--sort-common
-tryldflag LDFLAGS_AUTO -Wl,-z,noexecstack
 
 CPPFLAGS_AUTO="${CPPFLAGS_AUTO}${addincpath}"