Re: breakage at usr.sbin/jail/Makefile

On Wed, Nov 20, 2019 at 08:18:52PM -0800, Pete Wright wrote:
> 
> 
> On 11/20/19 8:13 PM, Glen Barber wrote:
> > On Wed, Nov 20, 2019 at 07:57:57PM -0800, Pete Wright wrote:
> > > Hello,
> > > looks like some of the recent commits to usr.sbin/jail/Makefile has broken
> > > CURRENT.  I am getting this error when attempting a buildworld:
> > > 
> > > ===> usr.sbin/jail (cleandir)
> > > make[4]: "/usr/home/pete/git/freebsd/usr.sbin/jail/Makefile" line 21:
> > > Malformed conditional (${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv")
> > > make[4]: Fatal errors encountered -- cannot continue
> > > make[4]: stopped in /usr/home/pete/git/freebsd/usr.sbin/jail
> > > *** [cleandir_subdir_usr.sbin/jail] Error code 1
> > > 
> > > 
> > > here's the code in question:
> > >   18 # workaround for GNU ld (GNU Binutils) 2.33.1:
> > >   19 #   relocation truncated to fit: R_RISCV_GPREL_I against `.LANCHOR2'
> > >   20 # https://bugs.freebsd.org/242109
> > >   21 .if ${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv"
> > >   22 CFLAGS+=-Wl,--no-relax
> > >   23 .endif
> > > 
> > > 
> > > looks like Ed Maste caught this already in the
> > > https://bugs.freebsd.org/242109 but wanted to flag it here as well in case
> > > anyone else runs into this in the hopes it saves some debugging time :)
> > > 
> > Reverted out of frustration in r354935.
> 
> thanks!
> 
> the issue seems to be on my amd64 system ${LINKER_TYPE} is not defined.  i was
> contemplating suggesting updating the .if clause in the Makefile like so:
> 
> .if defined($LINKER_TYPE}) && ${LINKER_TYPE} == "bfd" && ${MACHINE} ==
> "riscv"
> 
> 
> it allows things to compile on my end, but i'm not sure this is best way to
> resolve this issue.
> 

Not necessarily, there were followups to the original commit that leaned
in different directions.  But, nonetheless, I reverted the offending
commits because allowing head to be broken for hours is absurd, and
I personally do not tolerate it when I can resolve it.

Glen