Skip to content
Snippets Groups Projects
Commit 3f8de86d authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

distro: gcc: No longer store the absolute path of crt files.

* distro/packages/base.scm (gcc-4.7): Define
  STANDARD_STARTFILE_PREFIX_[12] instead of storing the absolute path of
  crt files.
parent 40749fb6
No related branches found
No related tags found
No related merge requests found
...@@ -759,9 +759,6 @@ (define-public gcc-4.7 ...@@ -759,9 +759,6 @@ (define-public gcc-4.7
;; Tell where to find libstdc++, libc, and `?crt*.o', except ;; Tell where to find libstdc++, libc, and `?crt*.o', except
;; `crt{begin,end}.o', which come with GCC. ;; `crt{begin,end}.o', which come with GCC.
;; XXX: For crt*.o, use `STANDARD_STARTFILE_PREFIX' instead? See
;; <http://www.linuxfromscratch.org/lfs/view/stable/chapter05/gcc-pass1.html>.
(substitute* ("gcc/config/gnu-user.h" (substitute* ("gcc/config/gnu-user.h"
"gcc/config/i386/gnu-user.h" "gcc/config/i386/gnu-user.h"
"gcc/config/i386/gnu-user64.h") "gcc/config/i386/gnu-user64.h")
...@@ -769,8 +766,11 @@ (define-public gcc-4.7 ...@@ -769,8 +766,11 @@ (define-public gcc-4.7
(format #f "#define LIB_SPEC \"-L~a/lib -rpath=~a/lib \ (format #f "#define LIB_SPEC \"-L~a/lib -rpath=~a/lib \
-rpath=~a/lib64 -rpath=~a/lib \" ~a~%" -rpath=~a/lib64 -rpath=~a/lib \" ~a~%"
libc libc out out suffix)) libc libc out out suffix))
(("([^ ]*)crt([^\\.])\\.o" _ prefix suffix) (("#define STARTFILE_SPEC.*$" line)
(string-append libc "/lib/" prefix "crt" suffix ".o")))) (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib\"
#define STANDARD_STARTFILE_PREFIX_2 \"\"
~a~%"
libc line))))
;; Don't retain a dependency on the build-time sed. ;; Don't retain a dependency on the build-time sed.
(substitute* "fixincludes/fixincl.x" (substitute* "fixincludes/fixincl.x"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment