guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: gcc: Force Aarch64 to use /lib.


From: Efraim Flashner
Subject: 01/01: gnu: gcc: Force Aarch64 to use /lib.
Date: Mon, 6 Mar 2017 04:45:24 -0500 (EST)

efraim pushed a commit to branch core-updates
in repository guix.

commit b773e9b005fe0479f6504dcbb9d44d5a380de95e
Author: Efraim Flashner <address@hidden>
Date:   Thu Feb 9 20:45:09 2017 +0200

    gnu: gcc: Force Aarch64 to use /lib.
    
    * gnu/packages/gcc.scm (gcc)[arguments]: On aarch64 replace force libdir
    to be lib and not lib64.
---
 gnu/packages/gcc.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 075642e..9376679 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -263,6 +263,12 @@ where the OS part is overloaded to denote a specific 
ABI---into GCC
                 (("static char const sed_cmd_z\\[\\] =.*;")
                  "static char const sed_cmd_z[] = \"sed\";"))
 
+              ;; Aarch64 support didn't land in GCC until the 4.8 series.
+              (when (file-exists? "gcc/config/aarch64")
+                ;; Force Aarch64 libdir to be /lib and not /lib64
+                (substitute* "gcc/config/aarch64/t-aarch64-linux"
+                  (("lib64") "lib")))
+
               (when (file-exists? "libbacktrace")
                 ;; GCC 4.8+ comes with libbacktrace.  By default it builds
                 ;; with -Werror, which fails with a -Wcast-qual error in glibc



reply via email to

[Prev in Thread] Current Thread [Next in Thread]