d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bsd.compiler.mk was implicitly included by bsd.own.mk in historical

Browse Source 
versions. With its movement to src.opts.mk, bsd.prog.mk was testing
COMPILER_TYPE without including the bsd.compiler.mk anymore. In the
source tree, this caused no problems, for reasons that aren't clear,
but does cause problems outside of the source tree. Allow
bsd.compiler.mk to be included multiple times safely, and always
include bsd.compiler.mk at the top of bsd.prog.mk. Resist the urge to
put it in bsd.init.mk, since that would reintroduce the implicit
include.
This commit is contained in:
Warner Losh 2014-05-07 18:15:02 +00:00
parent 5d420b97e6
commit bd871f14b7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=265581
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UPDATING
View File

@ -44,6 +44,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
temporary breakage was fixed with MAKESYSPATH settings for buildworld
as well...
One side effect of all this cleaning up is that bsd.compiler.mk
is no longer implicitly included by bsd.own.mk. If you wish to
use COMPILER_TYPE, you must now explicitly include bsd.compiler.mk
as well.
20140430:
The lindev device has been removed since /dev/full has been made a
standard device. __FreeBSD_version has been bumped.

5
share/mk/bsd.compiler.mk
View File

@ -1,5 +1,8 @@
# $FreeBSD$
.if !target(__<bsd.compiler.mk>__)
__<bsd.compiler.mk>__:
.if !defined(COMPILER_TYPE)
. if ${CC:T:Mgcc*}
COMPILER_TYPE:= gcc
@ -25,3 +28,5 @@ COMPILER_FEATURES= c++11
.else
COMPILER_FEATURES=
.endif
.endif # !target(__<bsd.compiler.mk>__)

1
share/mk/bsd.prog.mk
View File

@ -2,6 +2,7 @@
# $FreeBSD$
.include <bsd.init.mk>
.include <bsd.compiler.mk>
.SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm