diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2020-04-09 20:43:02 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2020-04-09 20:43:02 +0000 |
| commit | 8b7545172dd4fa0be82dc0ca88ed4f09b666f992 (patch) | |
| tree | 9411caefc867575a8934c9ca0d77521ab7faa800 /Mk | |
| parent | 773d8b5852d19af8278787257ed051b3f2349eaf (diff) | |
| download | freebsd-ports-8b7545172dd4fa0be82dc0ca88ed4f09b666f992.zip | |
Simplify the logic by removing a variable (_GCC_PORT_DEPENDS) and
instead use two equivalent ones (depending on the circumstances).
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gcc.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk index f6eb4681ad46..24164668a190 100644 --- a/Mk/bsd.gcc.mk +++ b/Mk/bsd.gcc.mk @@ -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 |