guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 80eeec84f3dd745a40e53adcd7e81c03feab5184 Author: Zheng Junjie <[email protected]> AuthorDate: Wed Jul 22 23:19:51 2026 +0800 gnu: gcc-13: Fix build on x86_64-gnu. * gnu/packages/patches/gcc-13-fix-hurd-lib.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gcc.scm (gcc-13)[source]: Use it. Co-Authored-By: Yelninei <[email protected]> --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 3 ++- gnu/packages/patches/gcc-13-fix-hurd-lib.patch | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index d16cb73a37..59b1fdb63b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1427,6 +1427,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-12-cross-environment-variables.patch \ %D%/packages/patches/gcc-11-libstdc++-powerpc.patch \ %D%/packages/patches/gcc-13-cross-system-header-dir.patch \ + %D%/packages/patches/gcc-13-fix-hurd-lib.patch \ %D%/packages/patches/gcc-12-libsanitizer-no-crypt.patch \ %D%/packages/patches/gcc-13-libsanitizer-no-crypt.patch \ %D%/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 29ac815523..45873a87ca 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -971,7 +971,8 @@ It also includes runtime support libraries for these languages.") "gcc-13-libsanitizer-no-crypt.patch" "gcc-libstdc++-newer-gcc.patch" "gcc-mangle-guix-store.patch" - "gcc-hurd-split-stack.patch")) + "gcc-hurd-split-stack.patch" + "gcc-13-fix-hurd-lib.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (properties diff --git a/gnu/packages/patches/gcc-13-fix-hurd-lib.patch b/gnu/packages/patches/gcc-13-fix-hurd-lib.patch new file mode 100644 index 0000000000..da1ef9de07 --- /dev/null +++ b/gnu/packages/patches/gcc-13-fix-hurd-lib.patch @@ -0,0 +1,12 @@ +Index: gcc/gcc/config/i386/t-linux64 +=================================================================== +--- gcc.orig/gcc/config/i386/t-linux64 ++++ gcc/gcc/config/i386/t-linux64 +@@ -33,6 +33,6 @@ + comma=, + MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) + MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) +-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) ++MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu) + MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) + MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) \ No newline at end of file
