svn commit: r289384 - head/lib

Ian Lepore ian at freebsd.org
Thu Oct 15 21:00:13 UTC 2015


On Thu, 2015-10-15 at 13:54 -0700, Bryan Drewery wrote:
> On 10/15/2015 1:27 PM, Bryan Drewery wrote:
> > Author: bdrewery
> > Date: Thu Oct 15 20:27:15 2015
> > New Revision: 289384
> > URL: https://svnweb.freebsd.org/changeset/base/289384
> > 
> > Log:
> >   Let the SUBDIR_DEPEND*c++ variables actually work rather than
> > being parsed
> >   as a +=.  These were safe due to a .WAIT very early on.
> >   
> 
> My analysis was wrong. The libc++ dependency on libcxxrt was actually
> broken here and would not have built if you went directly into lib
> and
> built in parallel. It was hidden by the fact that a proper dependency
> is
> in Makefile.inc1 via an __L target. The power of redundancy!
> 
> This too allows kerberos5/lib to work with SUBDIR_PARALLEL= since
> it's
> so greatly defined in Makefile.inc1.
> 
> 

But don't both sets of dependencies have to be correct?  As I vaguely
recall, the ones in Makefile.inc1 are used during bootstrapping and
tool building, and the ones in lib/Makefile are used when world
-building.  It may be that when MACHINE_ARCH == TARGET_ARCH some of
them are the same libraries and the Makefile.inc1 dependencies take
care of everything.

-- Ian

> > -SUBDIR_DEPEND_libc++= libcxxrt
> > +SUBDIR_DEPEND_libc++:= libcxxrt
> >  SUBDIR_DEPEND_libc= libcompiler_rt
> >  SUBDIR_DEPEND_libcam= libsbuf
> >  SUBDIR_DEPEND_libcapsicum= libnv
> > @@ -148,7 +148,7 @@ SUBDIR_DEPEND_libpjdlog= libutil
> 
> 


More information about the svn-src-head mailing list