Date: Thu, 9 Apr 2020 20:43:02 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531271 - head/Mk Message-ID: <202004092043.039Kh2MN077927@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004092043.039Kh2MN077927>