diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-10-26 09:07:37 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-10-26 09:07:37 +0200 |
| commit | 20d83444dda3ccbb4e8bbff1d4cbfe429eb015f6 (patch) | |
| tree | 49a64aa7861ca704904c18c9a93b58208002601f /distro | |
| parent | 450ccdc3aae6d1a0f1685de3bef4d962e18c3855 (diff) | |
| download | gnu-guix-20d83444dda3ccbb4e8bbff1d4cbfe429eb015f6.tar gnu-guix-20d83444dda3ccbb4e8bbff1d4cbfe429eb015f6.tar.gz | |
utils: Remove special `substitute*' syntax for lists of files.
* guix/build/utils.scm (substitute*): Remove special syntax for
list-of-files; instead, check whether FILE is `list?' at run time.
* distro/packages/base.scm (gcc-4.7, %binutils-static): Adjust
accordingly.
Diffstat (limited to 'distro')
| -rw-r--r-- | distro/packages/base.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/distro/packages/base.scm b/distro/packages/base.scm index fd9f7055d2..4cf9f70a23 100644 --- a/distro/packages/base.scm +++ b/distro/packages/base.scm @@ -759,9 +759,9 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.") ;; Tell where to find libstdc++, libc, and `?crt*.o', except ;; `crt{begin,end}.o', which come with GCC. - (substitute* ("gcc/config/gnu-user.h" - "gcc/config/i386/gnu-user.h" - "gcc/config/i386/gnu-user64.h") + (substitute* '("gcc/config/gnu-user.h" + "gcc/config/i386/gnu-user.h" + "gcc/config/i386/gnu-user64.h") (("#define LIB_SPEC (.*)$" _ suffix) (format #f "#define LIB_SPEC \"-L~a/lib -rpath=~a/lib \ -rpath=~a/lib64 -rpath=~a/lib \" ~a~%" @@ -2310,9 +2310,9 @@ store.") ;; The `-all-static' libtool flag can only be passed ;; after `configure', since configure tests don't use ;; libtool, and only for executables built with libtool. - (substitute* ("binutils/Makefile.in" - "gas/Makefile.in" - "ld/Makefile.in") + (substitute* '("binutils/Makefile.in" + "gas/Makefile.in" + "ld/Makefile.in") (("^LDFLAGS =(.*)$" line) (string-append line "\nAM_LDFLAGS = -static -all-static\n")))) |