git: a893761fe52a - main - Mk/bsd.gcc.mk: Simplify logic, only dealing with ports
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 16 Sep 2023 13:04:56 UTC
The branch main has been updated by gerald:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a893761fe52a3fbf5931d90b334b8ae9738ba50a
commit a893761fe52a3fbf5931d90b334b8ae9738ba50a
Author: Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2023-09-16 13:03:28 +0000
Commit: Gerald Pfeifer <gerald@FreeBSD.org>
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)