diff options
| author | Andy Patterson <ajpatter@uwaterloo.ca> | 2017-04-03 09:01:30 -0400 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2017-05-16 15:18:15 +0200 |
| commit | 40f56176c517d9b5e0d3da8cc06d3ccde6b58cc2 (patch) | |
| tree | beec782a0abf0c60351d8e4596c573f4450494bc /guix/build/asdf-build-system.scm | |
| parent | 0186a463d0f352eef485326cf57619d23a26734e (diff) | |
| download | guix-patches-40f56176c517d9b5e0d3da8cc06d3ccde6b58cc2.tar guix-patches-40f56176c517d9b5e0d3da8cc06d3ccde6b58cc2.tar.gz | |
build-system/asdf: Handle unusually-named systems.
* guix/build/lisp-utils.scm (valid-char-set): New variable.
(normalize-string): New procedure.
(compiled-system): Truncate the name of a system which contains slashes.
(generate-system-definition, make-asd-file): Use `normalize-string' to alter
the names of the created system and its dependencies.
* guix/build/asdf-build-system.scm (create-asd-file): Normalize the name of
the asd file being created.
Diffstat (limited to 'guix/build/asdf-build-system.scm')
| -rw-r--r-- | guix/build/asdf-build-system.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm index 4f3fc162ff..fd4d84dfa0 100644 --- a/guix/build/asdf-build-system.scm +++ b/guix/build/asdf-build-system.scm @@ -153,8 +153,10 @@ valid." (let*-values (((out) (library-output outputs)) ((_ version) (package-name->name+version (strip-store-file-name out))) - ((new-asd-file) (string-append (library-directory out) - "/" asd-system-name ".asd"))) + ((new-asd-file) (string-append + (library-directory out) + "/" (normalize-string asd-system-name) + ".asd"))) (make-asd-file new-asd-file #:system asd-system-name |