Use ${STATIC} instead of hardcoded -static in order to take advantage of

static pie.

ok deraadt@ miod@ benno@

diff --git a/usr.bin/bgplg/bgpctl/Makefile b/usr.bin/bgplg/bgpctl/Makefile
index a73d283..bcc4b20 100644 (file)
--- a/usr.bin/bgplg/bgpctl/Makefile
+++ b/usr.bin/bgplg/bgpctl/Makefile
@@ -1,8 +1,8 @@
-#      $OpenBSD: Makefile,v 1.1 2006/12/11 23:10:10 reyk Exp $
+#      $OpenBSD: Makefile,v 1.2 2014/12/23 19:32:16 pascal Exp $
 
 PROGDIR=       ${.CURDIR}/../../../usr.sbin/bgpctl
 
-LDSTATIC=      -static
+LDSTATIC=      ${STATIC}
 CFLAGS+=       -I${PROGDIR} -I${PROGDIR}/../bgpd
 NOMAN=         yes
 

diff --git a/usr.bin/bgplg/bgplg/Makefile b/usr.bin/bgplg/bgplg/Makefile
index ef2579d..ad956f5 100644 (file)
--- a/usr.bin/bgplg/bgplg/Makefile
+++ b/usr.bin/bgplg/bgplg/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.1 2006/12/11 23:10:11 reyk Exp $
+#      $OpenBSD: Makefile,v 1.2 2014/12/23 19:32:16 pascal Exp $
 
 .PATH:         ${.CURDIR}/..
 
@@ -10,7 +10,7 @@ CLFAGS+=      -Wmissing-declarations -Wredundant-decls
 CFLAGS+=       -Wshadow -Wpointer-arith -Wcast-qual
 CFLAGS+=       -Wsign-compare
 CFLAGS+=       -I${.CURDIR}
-LDSTATIC=      -static
+LDSTATIC=      ${STATIC}
 MAN=           bgplg.8
 
 BINDIR=                /var/www/cgi-bin

diff --git a/usr.bin/bgplg/ping/Makefile b/usr.bin/bgplg/ping/Makefile
index ede97cb..f157d86 100644 (file)
--- a/usr.bin/bgplg/ping/Makefile
+++ b/usr.bin/bgplg/ping/Makefile
@@ -1,8 +1,8 @@
-#      $OpenBSD: Makefile,v 1.1 2006/12/11 23:10:11 reyk Exp $
+#      $OpenBSD: Makefile,v 1.2 2014/12/23 19:32:16 pascal Exp $
 
 PROGDIR=       ${.CURDIR}/../../../sbin/ping
 
-LDSTATIC=      -static
+LDSTATIC=      ${STATIC}
 CFLAGS+=       -I${PROGDIR}
 NOMAN=         yes
 

diff --git a/usr.bin/bgplg/ping6/Makefile b/usr.bin/bgplg/ping6/Makefile
index 837a56d..0cbbe80 100644 (file)
--- a/usr.bin/bgplg/ping6/Makefile
+++ b/usr.bin/bgplg/ping6/Makefile
@@ -1,8 +1,8 @@
-#      $OpenBSD: Makefile,v 1.1 2010/04/02 21:20:49 sthen Exp $
+#      $OpenBSD: Makefile,v 1.2 2014/12/23 19:32:16 pascal Exp $
 
 PROGDIR=       ${.CURDIR}/../../../sbin/ping6
 
-LDSTATIC=      -static
+LDSTATIC=      ${STATIC}
 CFLAGS+=       -I${PROGDIR}
 NOMAN=         yes
 

diff --git a/usr.bin/bgplg/traceroute/Makefile b/usr.bin/bgplg/traceroute/Makefile
index 49c63e9..7d2b093 100644 (file)
--- a/usr.bin/bgplg/traceroute/Makefile
+++ b/usr.bin/bgplg/traceroute/Makefile
@@ -1,8 +1,8 @@
-#      $OpenBSD: Makefile,v 1.3 2014/07/16 20:06:27 okan Exp $
+#      $OpenBSD: Makefile,v 1.4 2014/12/23 19:32:16 pascal Exp $
 
 PROGDIR=       ${.CURDIR}/../../../usr.sbin/traceroute
 
-LDSTATIC=      -static
+LDSTATIC=      ${STATIC}
 CFLAGS+=       -I${PROGDIR}
 NOMAN=         yes