diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-03-24 15:44:24 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-03-24 20:57:29 +0200 |
| commit | 6dd338ee1b02503f0baf9480065ae69ba520154e (patch) | |
| tree | 2ea0f0e232948891187a6c0ddea290d84d773b3b | |
| parent | 8f0cd6575dc2f933a86b8b0a3d193813712b1ff0 (diff) | |
| download | guix-6dd338ee1b02503f0baf9480065ae69ba520154e.tar.gz | |
gnu: make-libstdc++: Unconditionally apply powerpc substitution.
* gnu/packages/gcc.scm (make-libstdc++)[arguments]: Use modify-phases. Apply powerpc directory substitution on all architectures.
| -rw-r--r-- | gnu/packages/gcc.scm | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index b64f933191..13d6b20801 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -596,25 +596,16 @@ using compilers other than GCC." (arguments `(#:out-of-source? #t #:phases - ;; TODO: Use the target-powerpc arm for everyone. - ,(if (target-powerpc?) - `(modify-phases %standard-phases - ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64. - (add-before 'chdir 'fix-rs6000-libdir - (lambda _ - (when (file-exists? "gcc/config/rs6000") - (substitute* (find-files "gcc/config/rs6000") - (("/lib64") "/lib"))) - #t)) - (add-before 'configure 'chdir - (lambda _ - (chdir "libstdc++-v3") - #t))) - `(alist-cons-before 'configure 'chdir - (lambda _ - (chdir "libstdc++-v3") - #t) - %standard-phases)) + (modify-phases %standard-phases + ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64. + (add-before 'chdir 'fix-rs6000-libdir + (lambda _ + (when (file-exists? "gcc/config/rs6000") + (substitute* (find-files "gcc/config/rs6000") + (("/lib64") "/lib"))))) + (add-before 'configure 'chdir + (lambda _ + (chdir "libstdc++-v3")))) #:configure-flags `("--disable-libstdcxx-pch" ,(string-append "--with-gxx-include-dir=" |