CVS commit: pkgsrc/lang/gcc12

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Nov 27 14:45:40 UTC 2023

Modified Files:
        pkgsrc/lang/gcc12: Makefile

Log Message:
gcc12: Stop subverting buildlink with LDFLAGS.

It's not clear why this was ever added in the first place (back in gcc46),
but it results in the build gcc finding libraries in PREFIX that aren't
buildlinked.

Discovered on macOS with the indirect DEPENDS checks where iconv was being
pulled in directly from PREFIX.  While here fix a non-ASCII space.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc12/Makefile

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

Modified files:

Index: pkgsrc/lang/gcc12/Makefile
diff -u pkgsrc/lang/gcc12/Makefile:1.7 pkgsrc/lang/gcc12/Makefile:1.8
--- pkgsrc/lang/gcc12/Makefile:1.7      Fri Oct 20 10:37:32 2023
+++ pkgsrc/lang/gcc12/Makefile  Mon Nov 27 14:45:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/10/20 10:37:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2023/11/27 14:45:40 jperkin Exp $
 
 PKGNAME=       ${GCC_PKGNAME}-${GCC12_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
@@ -13,8 +13,7 @@ LANGS=                        c
 # In some cases LINKER_RPATH_FLAG needs a trailing space.
 LINKER_RPATH_FLAG:=    ${LINKER_RPATH_FLAG:S/-rpath/& /}
 
-## The Library rpath to use in end programs.
-LDFLAGS_FOR_TARGET=    ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} ${LDFLAGS:M-Wl,-z*}
+LDFLAGS_FOR_TARGET=    ${LDFLAGS:M-Wl,-z*}
 
 # The "-static-libstdc++ -static-libgcc" flags are normally added to the
 # boot-ldflags by configure but because we are supply the boot-ldflags
@@ -25,7 +24,7 @@ BOOT_LDFLAGS+=                ${LDFLAGS:M-Wl,-syslibro
 # GCC does not understand this option; remove it, or stage build will fail
 BUILDLINK_TRANSFORM+=  rm:-stdlib=libc++
 
-# Work around ld bug in Xcode 15
+# Work around ld bug in Xcode 15
 .if ${OPSYS} == "Darwin" && ${CC_VERSION:Mclang-15.*}
 LDFLAGS_FOR_TARGET+=   -Wl,-ld_classic
 .endif