svn commit: r354900 - head/usr.sbin/jail

[Warner Losh]

On Wed, Nov 20, 2019 at 9:54 AM Li-Wen Hsu <lwhsu at freebsd.org> wrote:

> Author: lwhsu
> Date: Wed Nov 20 16:54:21 2019
> New Revision: 354900
> URL: https://svnweb.freebsd.org/changeset/base/354900
>
> Log:
>   Use the correct variable, also limit the scope to bfd
>
>   PR:           242109
>   Reported by:  jhb
>   Sponsored by: The FreeBSD Foundation
>
> Modified:
>   head/usr.sbin/jail/Makefile
>
> Modified: head/usr.sbin/jail/Makefile
>
> ==============================================================================
> --- head/usr.sbin/jail/Makefile Wed Nov 20 16:35:58 2019        (r354899)
> +++ head/usr.sbin/jail/Makefile Wed Nov 20 16:54:21 2019        (r354900)
> @@ -18,7 +18,7 @@ CFLAGS+=-I. -I${.CURDIR}
>  # workaround for GNU ld (GNU Binutils) 2.33.1:
>  #   relocation truncated to fit: R_RISCV_GPREL_I against `.LANCHOR2'
>  # https://bugs.freebsd.org/242109
> -.if ${MACHINE_ARCH} == "riscv"
> +.if ${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv"
>

MACHINE isn't the right thing to use here. It's never the proper thing in
userland makefiles, unless they are interfacing with the kernel.

MACHINE_CPUARCH is what you want here.

Warner

>  CFLAGS+=-Wl,--no-relax
>  .endif
>
>