From b773e9b005fe0479f6504dcbb9d44d5a380de95e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Feb 2017 20:45:09 +0200 Subject: 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(+) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 075642ebd1..9376679f14 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 -- cgit 1.4.1