diff options
| author | Warner Losh <imp@FreeBSD.org> | 2014-05-06 04:22:01 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2014-05-06 04:22:01 +0000 |
| commit | c6063d0da8e1f8d8452b0c2ee1c7ad718c1a7052 (patch) | |
| tree | feab560c7ac78d6da6d5e59636d346110d120bd7 /gnu/lib | |
| parent | 5e84b765f494ad58dd436e816b4b38dd5a0e3d09 (diff) | |
| download | src-c6063d0da8e1f8d8452b0c2ee1c7ad718c1a7052.tar.gz src-c6063d0da8e1f8d8452b0c2ee1c7ad718c1a7052.zip | |
Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.
Notes
Notes:
svn path=/head/; revision=265420
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/Makefile | 2 | ||||
| -rw-r--r-- | gnu/lib/csu/Makefile | 2 | ||||
| -rw-r--r-- | gnu/lib/libgcc/Makefile | 2 | ||||
| -rw-r--r-- | gnu/lib/libgcov/Makefile | 2 | ||||
| -rw-r--r-- | gnu/lib/libstdc++/Makefile | 2 | ||||
| -rw-r--r-- | gnu/lib/libsupc++/Makefile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 0a607d7afa86..2651eef5abdb 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile index 02f540bad165..6ab5e87a1de4 100644 --- a/gnu/lib/csu/Makefile +++ b/gnu/lib/csu/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> MK_SSP= no GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index d3befcbb89a8..11af4305edbb 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -6,7 +6,7 @@ GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SHLIB_NAME= libgcc_s.so.1 SHLIBDIR?= /lib -.include <bsd.own.mk> +.include <src.opts.mk> # # libgcc is linked in last and thus cannot depend on ssp symbols coming # from earlier libraries. Disable stack protection for this library. diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile index aab624105291..5292f9f8d53f 100644 --- a/gnu/lib/libgcov/Makefile +++ b/gnu/lib/libgcov/Makefile @@ -3,7 +3,7 @@ MK_PROFILE= no MK_SSP= no -.include <bsd.own.mk> +.include <src.opts.mk> .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index b0d45d63b651..d19f9f3bb3ff 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile index acf1b58ed3c1..5cc5f04adf67 100644 --- a/gnu/lib/libsupc++/Makefile +++ b/gnu/lib/libsupc++/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc |