Nikita Karetnikov <nik...@karetnikov.org> skribis:

> #define LIB_SPEC 
> "-L/nix/store/7ya3mh0987kmc9xkwxzapkpw4s4hzkz0-glibc-2.17/lib 
> %{!static:-rpath=/nix/store/7ya3mh0987kmc9xkwxzapkpw4s4hzkz0-glibc-2.17/lib 
> %{!static-libgcc:-rpath=/nix/store/n4blfp5bz6lvx9w9afn1i9c9v7akjnns-gcc-4.7.2/lib64
>  -rpath=/nix/store/n4blfp5bz6lvx9w9afn1i9c9v7akjnns-gcc-4.7.2/lib}} " "\
>
> %{pthread:-lpthread} \
> %{shared:-lc} \
> %{!shared: \
>   %{profile:-lc_p} %{!profile:-lc}}"

Ooh, there’s an extra newline above.  I think it’s fixed by this:

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 23bf00b..5c39ec3 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -449,7 +449,7 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
                   ;; RUNPATH to GCC even when `libgcc_s' is not NEEDED.
                   ;; There's not much that can be done to avoid it, though.
                   (format #f "#define LIB_SPEC \"-L~a/lib %{!static:-rpath=~a/lib \
-%{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib}} \" ~a~%"
+%{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib}} \" ~a"
                           libc libc out out suffix))
                  (("#define STARTFILE_SPEC.*$" line)
                   (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib\"
Unfortunately, this change triggers a full rebuild, so it’s for
‘core-updates’.  But if it’s good for you, then go for it, and we can
open ‘core-updates’ again.

HTH,
Ludo’.

Reply via email to