s6

commit fc795e0f4c3ae99699731b84d2ce77f952323391
parent e2e57a9bf7429ca39d1aa302150ccccc76d692f0
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Fri,  9 Apr 2021 23:36:33 +0000

 Real noexecstack fix: make strip less greedy

Diffstat:
M
Makefile
 | 
4
++--
M
configure
 | 
1
-

2 files changed, 2 insertions(+), 3 deletions(-)
diff --git 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
@@ -350,7 +350,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}"