git: 96c17633d903 - main - Mk/bsd.gcc.mk: Never use /usr/bin/gcc

Gerald Pfeifer gerald at FreeBSD.org
Sat May 29 08:45:19 UTC 2021


The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=96c17633d90386b5bcf8637bcba99a677184db85

commit 96c17633d90386b5bcf8637bcba99a677184db85
Author:     Gerald Pfeifer <gerald at FreeBSD.org>
AuthorDate: 2021-05-29 06:55:08 +0000
Commit:     Gerald Pfeifer <gerald at FreeBSD.org>
CommitDate: 2021-05-29 08:45:12 +0000

    Mk/bsd.gcc.mk: Never use /usr/bin/gcc
    
    USE_GCC=any was introduced to leverage the old version of GCC 4.2
    installed as /usr/bin/gcc on some systems. That has increasingly
    not been present any longer (not on i386 and amd64 since 12.x and
    optionally 11.x, not even on the ppcdevref system according to
    linimon@) and hardly anyone actually has been testing ports in
    this scenario.
    
    So, finally stop using /usr/bin/gcc (and /usr/bin/gc++ and
    /usr/bin/gcpp) even if present.
    
    This makes USE_GCC=any just another way of spelling USE_GCC=yes
    before we finally de-orbit it.
    
    Discussed with: mat, linimon, pkubaj
---
 Mk/bsd.gcc.mk | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
index aed64671d194..0fc7c2c94877 100644
--- a/Mk/bsd.gcc.mk
+++ b/Mk/bsd.gcc.mk
@@ -68,16 +68,6 @@ IGNORE=	bad target specification in USE_GCC; only "build" is supported
 
 .if defined(USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)
 
-.if ${USE_GCC} == any && exists(/usr/bin/gcc)
-CC:=		gcc
-CXX:=		g++
-. if exists(/usr/bin/gcpp)
-CPP:=		gcpp
-. else
-CPP:=		cpp
-. endif
-.else # The regular approach, not using the age-old base compiler.
-
 # Handle USE_GCC=yes and USE_GCC=any.
 .if ${USE_GCC} == yes || ${USE_GCC} == any
 USE_GCC=	${GCC_DEFAULT}+
@@ -151,8 +141,6 @@ RUN_DEPENDS+=	${CC}:lang/${_GCC_PORT}
 USE_BINUTILS=	yes
 .endif
 
-.endif # USE_GCC=any
-
 .endif # defined(_USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)
 
 


More information about the dev-commits-ports-all mailing list