diff options
Diffstat (limited to 'gnu/packages/gcc.scm')
| -rw-r--r-- | gnu/packages/gcc.scm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 761d3a6998..d2652aef3f 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -206,7 +206,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC ;; Fix the dynamic linker's file name. (substitute* (find-files "gcc/config" - "^linux(64|-elf|-eabi)?\\.h$") + "^(linux|gnu)(64|-elf|-eabi)?\\.h$") (("#define GLIBC_DYNAMIC_LINKER([^ ]*).*$" _ suffix) (format #f "#define GLIBC_DYNAMIC_LINKER~a \"~a\"~%" suffix @@ -578,11 +578,7 @@ using compilers other than GCC." (("@XSL_STYLE_DIR@") (string-append docbook "/xml/xsl/" - (string-drop - docbook - (+ 34 - (string-length - (%store-directory)))))))))) + (strip-store-file-name docbook))))))) (replace 'build (lambda _ ;; XXX: There's also a 'doc-info' target, but it |