summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-04-09 23:36:46 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2021-04-09 23:36:46 +0000
commit7a719ef8293b671039cc022fb5a14c6f2a60f485 (patch)
treed7182ce73709ce13d5aa7c44605315cb4114338a
parente043d793cfedd0df91d9a0a5c7cb82687a7a0df7 (diff)
downloads6-rc-7a719ef8293b671039cc022fb5a14c6f2a60f485.tar.xz
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 53b7c72..7dd53d8 100755
--- a/configure
+++ b/configure
@@ -345,7 +345,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}"