diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-06-23 16:38:46 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-06-23 16:38:46 +0000 |
| commit | d20bd9e42b73627236f0b6f8b21c5e55da9bb195 (patch) | |
| tree | 51c4278317db59567a1ce8d0245171196bc51745 /Makefile.inc1 | |
| parent | e02aaf7b5a8b6c92e202da9065656f9d31275f40 (diff) | |
| download | src-d20bd9e42b73627236f0b6f8b21c5e55da9bb195.tar.gz src-d20bd9e42b73627236f0b6f8b21c5e55da9bb195.zip | |
Set compiler metadata for stageworld/distributeworld.
This fixes LD errors during 'make packages' but also for the unlikely case of
'buildworld' on 1 system and 'packages' on another [1].
PR: 212877 [1]
MFC after: 2 weeks
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=320274
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index b60bfc18146d..7ef7005691f1 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -87,7 +87,8 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} # Pull in compiler metadata from buildworld/toolchain if possible to avoid # running CC from bsd.compiler.mk. -.if make(installworld) || make(install) +.if make(installworld) || make(install) || make(distributeworld) || \ + make(stageworld) .-include "${OBJTREE}${.CURDIR}/compiler-metadata.mk" .endif |