From owner-svn-ports-head@freebsd.org Thu Apr 9 20:43:02 2020 Return-Path: Delivered-To: svn-ports-head@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 C80DE27E8FD; Thu, 9 Apr 2020 20:43:02 +0000 (UTC) (envelope-from gerald@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 48ytPy50tVz4G50; Thu, 9 Apr 2020 20:43:02 +0000 (UTC) (envelope-from gerald@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 A72941ACF8; Thu, 9 Apr 2020 20:43:02 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 039Kh2rm077928; Thu, 9 Apr 2020 20:43:02 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 039Kh2MN077927; Thu, 9 Apr 2020 20:43:02 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202004092043.039Kh2MN077927@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Thu, 9 Apr 2020 20:43:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531271 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 531271 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Apr 2020 20:43:02 -0000 Author: gerald Date: Thu Apr 9 20:43:02 2020 New Revision: 531271 URL: https://svnweb.freebsd.org/changeset/ports/531271 Log: Simplify the logic by removing a variable (_GCC_PORT_DEPENDS) and instead use two equivalent ones (depending on the circumstances). Modified: head/Mk/bsd.gcc.mk Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Thu Apr 9 20:31:45 2020 (r531270) +++ head/Mk/bsd.gcc.mk Thu Apr 9 20:43:02 2020 (r531271) @@ -95,7 +95,6 @@ _USE_GCC:= ${GCC_DEFAULT} # A concrete version has been selected. Set proper ports dependencies, # CC, CXX, CPP, and flags. V:= ${_USE_GCC:S/.//} -_GCC_PORT_DEPENDS:= gcc${V} _GCC_PORT:= gcc${V} CC:= gcc${V} CXX:= g++${V} @@ -117,11 +116,11 @@ LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} -L${_GCC_RUNTIME CFLAGS:= ${CFLAGS:N-mretpoline} CXXFLAGS:= ${CXXFLAGS:N-mretpoline} -.if defined(_GCC_PORT_DEPENDS) -BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:lang/${_GCC_PORT} -RUN_DEPENDS+= ${_GCC_PORT_DEPENDS}:lang/${_GCC_PORT} -# Later GCC ports already depend on binutils; make sure whatever we -# build leverages this as well. +.if defined(_GCC_PORT) +BUILD_DEPENDS+= ${CC}:lang/${_GCC_PORT} +RUN_DEPENDS+= ${CC}:lang/${_GCC_PORT} +# GCC ports already depend on binutils; make sure whatever we build +# leverages this as well. USE_BINUTILS= yes .endif