svn commit: r531271 - head/Mk
Gerald Pfeifer
gerald at FreeBSD.org
Thu Apr 9 20:43:02 UTC 2020
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
More information about the svn-ports-all
mailing list