From: pascal <pascal@openbsd.org>
Date: Tue, 23 Dec 2014 19:32:16 +0000 (+0000)
Subject: Use ${STATIC} instead of hardcoded -static in order to take advantage of
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f75dc19da3c1d27ff6dfddcc1461368686f8f2b8;p=openbsd

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 a73d283fa95..bcc4b20911a 100644
--- 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 ef2579dc184..ad956f52a8d 100644
--- 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 ede97cb99e2..f157d869b90 100644
--- 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 837a56d076c..0cbbe804c52 100644
--- 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 49c63e9d8e9..7d2b0934929 100644
--- 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