23/33: gnu: commencement: gcc-boot0: Build fix for the Hurd.

[guix-commits]

janneke pushed a commit to branch wip-hurd
in repository guix.

commit 7a57ca758c590742b63100944f07fddb7290f797
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Sun Mar 1 13:45:42 2020 +0100

    gnu: commencement: gcc-boot0: Build fix for the Hurd.
    
    Fixes:
        g++   -g -O2 -DIN_GCC  -DCROSS_DIRECTORY_STRUCTURE   -fno-exceptions 
-fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings 
-Wcast-qual -Wmissing-format-attribute -Woverloaded-virtual -pedantic 
-Wno-long-long -Wno-variadic-macros -Wno-overlength-strings   -DHAVE_CONFIG_H 
-DGENERATOR_FILE -fno-PIE -static-libstdc++ -static-libgcc 
-Wl,-rpath=/gnu/store/vp2id82a597p119b3wyhhkhd467wvn78-glibc-bootstrap-0/lib 
-Wl,-dynamic-linker -Wl,/gnu/store/vp2id82a597p119b3w [...]
            build/genmddeps.o build/read-md.o build/errors.o 
../build-i586-unknown-gnu/libiberty/libiberty.a
        
/gnu/store/jk3kx5jwjs9m60svzk6sz79bf0w33l91-binutils-cross-boot0-2.34/bin/ld: 
build/read-md.o: in function `md_reader::~md_reader()':
        
/tmp/guix-build-gcc-cross-boot0-7.5.0.drv-0/build/gcc/../../gcc-7.5.0/gcc/read-md.c:1049:
 undefined reference to `operator delete(void*, unsigned int)'
    
    This raises the question: Should libstdc++-boot0 (v4.9) be sufficient to 
build
    gcc-boot0 (v7.5.0)?
    
    * gnu/packages/commencement.scm (gcc-boot0): Add static library path.
---
 gnu/packages/commencement.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 9524748..9e019fb 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2841,6 +2841,10 @@ exec " gcc "/bin/" program
                     (libc-native (or (assoc-ref %build-inputs "libc-native")
                                      libc)))
                `(,(string-append "LDFLAGS="
+                                 (if ,(hurd-system?)
+                                     (string-append
+                                      "-L" (assoc-ref %build-inputs "gcc") 
"/lib ")
+                                     "")
                                  "-Wl,-rpath=" libc-native "/lib "
                                  "-Wl,-dynamic-linker "
                                  "-Wl," libc-native ,(glibc-dynamic-linker