CVS commit: pkgsrc/mk/compiler

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 18 11:58:04 UTC 2025

Modified Files:
        pkgsrc/mk/compiler: gcc.mk

Log Message:
mk: Allow _GCC_PREFIX to be precomputed.

This skips a bunch of highly unoptimised code to calculate the location
of pkgsrc GCC and its runtime library directory, as well as adding their
location to LDFLAGS.

Adding the library directory to LDFLAGS is unlikely to have been
required for well over a decade, since we override LINK_LIBGCC_SPEC, as
well as providing override specs for the gcc-libs packages.

>From Jonathan Perkin <jperkin%smartos.org@localhost>
via drecklypkg commit $8b6dee326c8c0625917f2b74301568709ba29731


To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 pkgsrc/mk/compiler/gcc.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.287 pkgsrc/mk/compiler/gcc.mk:1.288
--- pkgsrc/mk/compiler/gcc.mk:1.287     Tue Feb 18 11:57:12 2025
+++ pkgsrc/mk/compiler/gcc.mk   Tue Feb 18 11:58:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.287 2025/02/18 11:57:12 wiz Exp $
+# $NetBSD: gcc.mk,v 1.288 2025/02/18 11:58:03 wiz Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -1020,7 +1020,7 @@ _NEED_NEWER_GCC!= \
 PKG_FAIL_REASON+=      "Unable to satisfy dependency: ${_GCC_DEPENDS}"
 .endif
 
-.if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
+.if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) && !defined(_GCC_PREFIX)
 #
 # Ensure that the correct rpath is passed to the linker if we need to
 # link against gcc shared libs.
@@ -1062,9 +1062,8 @@ _GCC_LDFLAGS=     # empty
 .  for _dir_ in ${_GCC_LIBDIRS:N*not_found*}
 _GCC_LDFLAGS+= -L${_dir_} ${COMPILER_RPATH_FLAG}${_dir_}
 .  endfor
-.endif
-
 LDFLAGS+=      ${_GCC_LDFLAGS}
+.endif
 
 # Point the variables that specify the compiler to the installed
 # GCC executables.