From nobody Sat Sep 16 13:04:56 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rnrr86Tknz4sq66; Sat, 16 Sep 2023 13:04:56 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rnrr84R7Gz3fnL; Sat, 16 Sep 2023 13:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694869496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SwbLrwajIcW/6vD6Lm2GIHWh7COK/BEkykSZDxXZtA=; b=sQip5G09ydrLLkFiUOtuTINTt6S8jCZn65x+sb9SvewtP2lRy8y7lXZ/R4O8DYkTz/6b2k K/eQBPoZr66M+Au5kxKkTevyBZ2pN17aOOMujKGpH1Vo63COd3DjsfqoglAc82Nj49iKFY DCsLX39KsPF5Vxue4dNLWWy+vsvVbd7eo6/wUA/2M6JVLoc48wkgIHnYi/xxabQ4awzgrX PphrNjRIWMH/4RzB8a3lYJlUuyO9sZJvIL5ytSFK9q5R9mM6N3PyOu5FyzSM16QgSjibrS 92mgsia6Fs5+CWrw0uTDJ9bwL8+v7I6CMuEwQy/07U0ZS2W29LsQqlBP/asyMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694869496; a=rsa-sha256; cv=none; b=rJUBZ7e6g57YktdS5N9uP4Z/h1Z/Sl/AzhHH3jtexbTFZexI4qpxCfs4XUXWl7cdXY5U5f u4TPJJvy/h3QNt1rP0Ubuuhh4tAU/VJ7/SNuoSQkWkI53OOE6NVusgyBR1Kiheh8IHRSjb s4ZyQB7L4EUnTJLx/2LQ/fIE5mBy5h0AdqD1HLm0EX4FE09HBAcM48wBZnfwd7OwOvBnGW djSKmDo4Nu8lHCEEoEtJDde1Zf5+1Oh4j2Fb6SSurp+cEJapMaxF/Yj79Two0N+SBg/3ZN jYdcji1u6+I8euuIMpEY1MoGMo0RDcwWUrxb22R5dNNNW9Jh/m6VmQw0GTgoEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694869496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SwbLrwajIcW/6vD6Lm2GIHWh7COK/BEkykSZDxXZtA=; b=mmp7rFBkAmFmSATdMh5LIDXu7aPS8CaeFX0HMK/sN5stf1PVDeBq2kJJfmt1Wd+8FWq3/V Nrzr2Ga/5uSNcg636jKd3x/Tdv1LBCinb7zkvezI2LVM19T7yyARmk4Qn3w2f8HaHoFvdX kO2F5XJaWaNst03Sg3YiAo66yNZJ0RF0qRG2Aj0ZA3Pee5+uvGz9+krT9LQdebbvJTgjqx IW+iBY4q+awEznR7ePXj8XVyF6rcQdx86xin9sCOLzs8PaBU6j3sXNOgwVQJuLKwTAMUkk 6Yp0oISOc5+oC345mnSryX+1oxQWPlpfGisIHHzqfpvskxxo+jHphYMag3//pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rnrr83X1Cz172F; Sat, 16 Sep 2023 13:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38GD4uTP082801; Sat, 16 Sep 2023 13:04:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38GD4uLT082798; Sat, 16 Sep 2023 13:04:56 GMT (envelope-from git) Date: Sat, 16 Sep 2023 13:04:56 GMT Message-Id: <202309161304.38GD4uLT082798@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: a893761fe52a - main - Mk/bsd.gcc.mk: Simplify logic, only dealing with ports List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a893761fe52a3fbf5931d90b334b8ae9738ba50a Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=a893761fe52a3fbf5931d90b334b8ae9738ba50a commit a893761fe52a3fbf5931d90b334b8ae9738ba50a Author: Gerald Pfeifer AuthorDate: 2023-09-16 13:03:28 +0000 Commit: Gerald Pfeifer CommitDate: 2023-09-16 13:03:28 +0000 Mk/bsd.gcc.mk: Simplify logic, only dealing with ports We now only have to deal with GCC from ports, not base any longer. So strip a check that has been a no-op for a while (as evidenced by _GCC_PORT always being set directly above). --- Mk/bsd.gcc.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk index ec8804fa3c09..037e711c62df 100644 --- a/Mk/bsd.gcc.mk +++ b/Mk/bsd.gcc.mk @@ -110,15 +110,14 @@ LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} -L${_GCC_RUNTIME} CFLAGS:= ${CFLAGS:N-mretpoline} CXXFLAGS:= ${CXXFLAGS:N-mretpoline} -. if defined(_GCC_PORT) BUILD_DEPENDS+= ${CC}:lang/${_GCC_PORT} -. if defined(_USE_GCC_RUN_DEPENDS) +. if defined(_USE_GCC_RUN_DEPENDS) RUN_DEPENDS+= ${CC}:lang/${_GCC_PORT} -. endif +. endif + # GCC ports already depend on binutils; make sure whatever we build # leverages this as well. USE_BINUTILS= yes -. endif .endif # defined(_USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)