[src/trunk]: src/tools/binutils Disable enabling executable stack when the gn...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c0cddbf2f50
branches:  trunk
changeset: 373096:8c0cddbf2f50
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jan 18 12:52:55 2023 +0000

description:
Disable enabling executable stack when the gnu stack note is missing.
Merge common configure arguments.

diffstat:

 tools/binutils/Makefile |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r bdf5fd384750 -r 8c0cddbf2f50 tools/binutils/Makefile
--- a/tools/binutils/Makefile   Wed Jan 18 12:28:54 2023 +0000
+++ b/tools/binutils/Makefile   Wed Jan 18 12:52:55 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.36 2022/12/31 05:44:25 mrg Exp $
+#      $NetBSD: Makefile,v 1.37 2023/01/18 12:52:55 christos Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -11,10 +11,15 @@
        --with-bugurl="http://www.NetBSD.org/support/send-pr.html"; \
        --with-lib-path="=/usr/lib" --with-sysroot
 
-CONFIGURE_ARGS=        --target=${MACHINE_GNU_PLATFORM} --disable-nls \
+BASE_CONFIGURE_ARGS= \
+       --target=${MACHINE_GNU_PLATFORM} \
+       --enable-initfini-array=yes \
+       --enable-default-execstack=no \
+       ${BRANDING}
+
+CONFIGURE_ARGS=        --disable-nls --disable-werror \
                --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
-               --disable-werror --enable-initfini-array=yes \
-               ${BRANDING}
+               ${BASE_CONFIGURE_ARGS}
 
 MAKE_ARGS=     MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
 
@@ -61,9 +66,7 @@
                        ${HOST_SH} ${GNUHOSTDIST}/configure \
                        --build=`${GNUHOSTDIST}/config.guess` \
                        --host=${MACHINE_GNU_PLATFORM} \
-                       --target=${MACHINE_GNU_PLATFORM} \
-                       --enable-initfini-array=yes \
-                       ${BRANDING} \
+                       ${BASE_CONFIGURE_ARGS} \
                )
        PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
                (cd .native && ${MAKE} configure-host)