diff options
| author | imp <imp@FreeBSD.org> | 2014-05-07 18:15:02 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-05-07 18:15:02 +0000 |
| commit | 318358dcf467858e6cf746d43189a2e29e306127 (patch) | |
| tree | 51b110856e6d6ff642fc2208b824991dfb387e9f /share | |
| parent | 3667ac6cc1adc95547ff74eca2b6b173708d1d55 (diff) | |
| download | FreeBSD-src-318358dcf467858e6cf746d43189a2e29e306127.zip FreeBSD-src-318358dcf467858e6cf746d43189a2e29e306127.tar.gz | |
bsd.compiler.mk was implicitly included by bsd.own.mk in historical
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.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.compiler.mk | 5 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk index 2d648de..bb1229b 100644 --- a/share/mk/bsd.compiler.mk +++ b/share/mk/bsd.compiler.mk @@ -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>__) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index ea03f1f..06867eb 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -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 |
