From 647b2dbf6292353b80ba2014084215841d473dfd Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 15 Nov 2023 19:02:46 -0500 Subject: [PATCH] =?UTF-8?q?gcc6:=20don=E2=80=99t=20link=20libstdc++=20to?= =?UTF-8?q?=20CoreFoundation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using flat namespaces causes libstdc++ to link CoreFoundation, but that fails after #265102. Since CoreFoundation is not actually needed, disable flat namespaces to avoid linking it unnecessarily. Disabling flat namespaces matches the behavior of newer versions of libstdc++ (GCC 7+) when building for newer Darwin hosts (10.5+). --- .../6/libstdc++-disable-flat_namespace.patch | 26 +++++++++++++++++++ .../compilers/gcc/patches/default.nix | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/compilers/gcc/patches/6/libstdc++-disable-flat_namespace.patch diff --git a/pkgs/development/compilers/gcc/patches/6/libstdc++-disable-flat_namespace.patch b/pkgs/development/compilers/gcc/patches/6/libstdc++-disable-flat_namespace.patch new file mode 100644 index 0000000000000..571644410def0 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/6/libstdc++-disable-flat_namespace.patch @@ -0,0 +1,26 @@ +Backported from GCC 7. + +diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host +index 304a7f5aff6..d1a189d93d0 100644 +--- a/libstdc++-v3/configure.host ++++ b/libstdc++-v3/configure.host +@@ -234,7 +234,7 @@ case "${host_os}" in + os_include_dir="os/newlib" + OPT_LDFLAGS="${OPT_LDFLAGS} \$(lt_host_flags)" + ;; +- darwin | darwin[1-7] | darwin[1-7].*) ++ darwin[1-7] | darwin[1-7].*) + # On Darwin, performance is improved if libstdc++ is single-module. + # Up to at least 10.3.7, -flat_namespace is required for proper + # treatment of coalesced symbols. +@@ -252,6 +252,10 @@ case "${host_os}" in + esac + os_include_dir="os/bsd/darwin" + ;; ++ darwin*) ++ # Post Darwin8, defaults should be sufficient. ++ os_include_dir="os/bsd/darwin" ++ ;; + *djgpp*) # leading * picks up "msdosdjgpp" + os_include_dir="os/djgpp" + error_constants_dir="os/djgpp" diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 15880913bde1a..16a6c854e6195 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -259,6 +259,9 @@ in # This patch can be dropped should darwin.cctools-llvm ever implement support. ++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch +# Building libstdc++ with flat namespaces results in trying to link CoreFoundation, which +# defaults to the impure, system location and causes the build to fail. +++ optional (is6 && hostPlatform.isDarwin) ./6/libstdc++-disable-flat_namespace.patch ## gcc 4.9 and older ##############################################################################