01/02: Revert "commencement: Link gcc-final correctly with libstdc++ on powerpc64le."

[guix-commits]

marusich pushed a commit to branch wip-ppc64le
in repository guix.

commit b33fb2acaa93835ca0b968c311c4aff681ddf9df
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Sat Feb 6 11:53:00 2021 -0800

    Revert "commencement: Link gcc-final correctly with libstdc++ on 
powerpc64le."
    
    This reverts commit ffcc950261c829e76f2faf6c8ea03d3fc56a20e1.  It turns out
    that in GNU Guix, the convention is to install libraries in /lib, even if 
they
    are 64-bit.  Therefore, we will attempt to fix the original gcc-final build
    issue by updating libstdc++ to install to /lib instead of /lib64, rather 
than
    by telling gcc-final to look in /lib64 to find libstdc++.
---
 gnu/packages/commencement.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index da9129e..a5940a5 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3598,12 +3598,7 @@ 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++")
-                                         ;; On powerpc64 and powerpc64le,
-                                         ;; libstdc++ installs to /lib64.
-                                         ,(if (string-prefix? "powerpc64" 
(%current-system))
-                                              "/lib64"
-                                              "/lib")
-                                        " -L" zlib "/lib -Wl,-rpath="
+                                         "/lib -L" zlib "/lib -Wl,-rpath="
                                          zlib "/lib")
                           flag))
                     ,flags)))