From owner-svn-src-all@freebsd.org  Wed Nov 20 16:54:22 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6511C1BC07C;
 Wed, 20 Nov 2019 16:54:22 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47J81B22B5z43tH;
 Wed, 20 Nov 2019 16:54:22 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 28E1325B1A;
 Wed, 20 Nov 2019 16:54:22 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAKGsMOM094015;
 Wed, 20 Nov 2019 16:54:22 GMT (envelope-from lwhsu@FreeBSD.org)
Received: (from lwhsu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAKGsMTv094014;
 Wed, 20 Nov 2019 16:54:22 GMT (envelope-from lwhsu@FreeBSD.org)
Message-Id: <201911201654.xAKGsMTv094014@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to
 lwhsu@FreeBSD.org using -f
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Date: Wed, 20 Nov 2019 16:54:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r354900 - head/usr.sbin/jail
X-SVN-Group: head
X-SVN-Commit-Author: lwhsu
X-SVN-Commit-Paths: head/usr.sbin/jail
X-SVN-Commit-Revision: 354900
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Nov 2019 16:54:22 -0000

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"
 CFLAGS+=-Wl,--no-relax
 .endif