[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-ppc64le updated: commencement: Link gcc-final correctly with
From: |
guix-commits |
Subject: |
branch wip-ppc64le updated: commencement: Link gcc-final correctly with libstdc++ on powerpc64le. |
Date: |
Thu, 04 Feb 2021 03:18:43 -0500 |
This is an automated email from the git hooks/post-receive script.
marusich pushed a commit to branch wip-ppc64le
in repository guix.
The following commit(s) were added to refs/heads/wip-ppc64le by this push:
new ffcc950 commencement: Link gcc-final correctly with libstdc++ on
powerpc64le.
ffcc950 is described below
commit ffcc950261c829e76f2faf6c8ea03d3fc56a20e1
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Fri Jul 10 12:57:33 2020 +0200
commencement: Link gcc-final correctly with libstdc++ on powerpc64le.
Fixes <https://bugs.gnu.org/46253>.
* gnu/packages/commencement.scm (gcc-final)[#:make-flags]: On powerpc64le
(and
powerpc64), update LDFLAGS to use libstdc++'s /lib64 directory, not /lib.
---
gnu/packages/commencement.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index a5940a5..da9129e 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3598,7 +3598,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"$@\"~%"
(if (string-prefix? "LDFLAGS=" flag)
(string-append flag " -L"
(assoc-ref %build-inputs "libstdc++")
- "/lib -L" zlib "/lib -Wl,-rpath="
+ ;; On powerpc64 and powerpc64le,
+ ;; libstdc++ installs to /lib64.
+ ,(if (string-prefix? "powerpc64"
(%current-system))
+ "/lib64"
+ "/lib")
+ " -L" zlib "/lib -Wl,-rpath="
zlib "/lib")
flag))
,flags)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch wip-ppc64le updated: commencement: Link gcc-final correctly with libstdc++ on powerpc64le.,
guix-commits <=