From 21f7074adead943a0dc3cef015c11ab5e77c3f67 Mon Sep 17 00:00:00 2001 From: ru Date: Sat, 21 Feb 2009 15:04:31 +0000 Subject: Fix build when WITH_SSP is set explicitly. Submitted by: Jeremie Le Hen --- sys/boot/Makefile.inc | 2 +- sys/boot/i386/loader/Makefile | 3 +-- sys/boot/ia64/common/Makefile | 3 +-- sys/boot/ia64/efi/Makefile | 2 +- sys/boot/ia64/ski/Makefile | 2 +- sys/boot/pc98/loader/Makefile | 3 +-- sys/boot/powerpc/ofw/Makefile | 3 +-- sys/boot/sparc64/loader/Makefile | 3 +-- 8 files changed, 8 insertions(+), 13 deletions(-) (limited to 'sys/boot') diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc index 09bde81..3545446 100644 --- a/sys/boot/Makefile.inc +++ b/sys/boot/Makefile.inc @@ -1,3 +1,3 @@ # $FreeBSD$ -WITHOUT_SSP= +SSP_CFLAGS= diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index f1aa15c..cd3c951 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader.sym INTERNALPROG= diff --git a/sys/boot/ia64/common/Makefile b/sys/boot/ia64/common/Makefile index d36c550..8261c25 100644 --- a/sys/boot/ia64/common/Makefile +++ b/sys/boot/ia64/common/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include +MK_SSP= no LIB= ia64 INTERNALLIB= diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile index 5c7fda5..5682ac8 100644 --- a/sys/boot/ia64/efi/Makefile +++ b/sys/boot/ia64/efi/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ NO_MAN= -WITHOUT_SSP= .include +MK_SSP= no PROG= loader.sym INTERNALPROG= diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile index 76498d3..081fd72 100644 --- a/sys/boot/ia64/ski/Makefile +++ b/sys/boot/ia64/ski/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ NO_MAN= -WITHOUT_SSP= .include +MK_SSP= no PROG= skiload STRIP= # We must not strip skiload at install time. diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile index a8b35ff..91d5150 100644 --- a/sys/boot/pc98/loader/Makefile +++ b/sys/boot/pc98/loader/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader.sym INTERNALPROG= diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile index 2bdde76..dfc80db 100644 --- a/sys/boot/powerpc/ofw/Makefile +++ b/sys/boot/powerpc/ofw/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH} diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile index 9ee93d4..0d7161c 100644 --- a/sys/boot/sparc64/loader/Makefile +++ b/sys/boot/sparc64/loader/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader NEWVERSWHAT= "bootstrap loader" sparc64 -- cgit v1.1