From owner-svn-ports-all@freebsd.org  Fri Dec 20 01:11:42 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-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 297B41EFBF8;
 Fri, 20 Dec 2019 01:11:42 +0000 (UTC) (envelope-from jhb@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 47f9gf0KnPz4JQx;
 Fri, 20 Dec 2019 01:11:42 +0000 (UTC) (envelope-from jhb@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 06B001F320;
 Fri, 20 Dec 2019 01:11:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBK1Bfl5076239;
 Fri, 20 Dec 2019 01:11:41 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBK1BfHv076213;
 Fri, 20 Dec 2019 01:11:41 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201912200111.xBK1BfHv076213@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 20 Dec 2019 01:11:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r520454 - head/Mk
X-SVN-Group: ports-head
X-SVN-Commit-Author: jhb
X-SVN-Commit-Paths: head/Mk
X-SVN-Commit-Revision: 520454
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2019 01:11:42 -0000

Author: jhb (src,doc committer)
Date: Fri Dec 20 01:11:41 2019
New Revision: 520454
URL: https://svnweb.freebsd.org/changeset/ports/520454

Log:
  Use ARCH instead of MACHINE to check for mips.
  
  Cross-building ports via CROSS_TOOLCHAIN and CROSS_SYSROOT only set
  ARCH to the target arch.  MACHINE still references the host.  This
  unbreaks cross-building ports for mips.
  
  Reviewed by:	jbeich, portmgr (bapt)
  Differential Revision:	https://reviews.freebsd.org/D22592

Modified:
  head/Mk/bsd.ssp.mk

Modified: head/Mk/bsd.ssp.mk
==============================================================================
--- head/Mk/bsd.ssp.mk	Fri Dec 20 00:02:18 2019	(r520453)
+++ head/Mk/bsd.ssp.mk	Fri Dec 20 01:11:41 2019	(r520454)
@@ -4,7 +4,7 @@
 SSP_Include_MAINTAINER=	portmgr@FreeBSD.org
 
 .if !defined(SSP_UNSAFE) && \
-    (${MACHINE} != "mips")
+    (! ${ARCH:Mmips*})
 # Overridable as a user may want to use -fstack-protector-all
 SSP_CFLAGS?=	-fstack-protector-strong
 CFLAGS+=	${SSP_CFLAGS}