artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mescc: Exit if library cannot be found.

Browse source 
* module/mescc/mescc.scm (arch-find): Exit upon failure.
This commit is contained in:
Jan Nieuwenhuizen 2018-11-08 14:46:46 +01:00
parent aa8fd3da9e
commit cd70c63a40
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
module/mescc/mescc.scm
View file

@ -205,7 +205,9 @@
((equal? machine "64") "2") ((equal? machine "64") "2")
(else "1"))) (else "1")))
(base-address (option-ref options 'base-address "0x1000000")) (base-address (option-ref options 'base-address "0x1000000"))
(elf-footer (or elf-footer (arch-find options (string-append"elf" machine "-footer-single-main.hex2")))) (elf-footer (or elf-footer
(arch-find options (string-append
"elf" machine "-footer-single-main.hex2"))))
(command `(,hex2 (command `(,hex2
"--LittleEndian" "--LittleEndian"
"--Architecture" ,architecture "--Architecture" ,architecture
@ -246,8 +248,15 @@
(define (replace-suffix file-name suffix) (define (replace-suffix file-name suffix)
(let* ((parts (string-split file-name #\.)) (let* ((parts (string-split file-name #\.))
(base (if (pair? (cdr parts)) (drop-right parts 1)))) (base (if (pair? (cdr parts)) (drop-right parts 1)))
(string-append (string-join base ".") suffix))) (old-suffix (last parts))
(program-prefix (cond ((string-prefix? "x86-mes-" old-suffix) ".x86-mes-")
((string-prefix? "x86_64-mes-" old-suffix) ".x86_64-mes-")
(else "."))))
(if (string-null? suffix)
(if (string-null? program-prefix) (string-join base ".")
(string-append (string-drop program-prefix 1) (string-join base ".")))
(string-append (string-join base ".") program-prefix (string-drop suffix 1)))))
(define (find-library options ext o) (define (find-library options ext o)
(arch-find options (string-append "lib" o ext))) (arch-find options (string-append "lib" o ext)))
@ -265,11 +274,13 @@
(filter-map (multi-opt 'library-dir) options))) (filter-map (multi-opt 'library-dir) options)))
(arch-file-name (string-append arch "/" file-name)) (arch-file-name (string-append arch "/" file-name))
(verbose? (option-ref options 'verbose #f))) (verbose? (option-ref options 'verbose #f)))
(when verbose? (let ((file (search-path path arch-file-name)))
(stderr "arch-find=~s\n" arch-file-name) (when verbose?
(stderr " path=~s\n" path) (stderr "arch-find=~s\n" arch-file-name)
(stderr " => ~s\n" (search-path path arch-file-name))) (stderr " path=~s\n" path)
(search-path path arch-file-name))) (stderr " => ~s\n" file))
(or file
(error (format #f "mescc: file not found: ~s" arch-file-name))))))
(define (prefix-file options file-name) (define (prefix-file options file-name)
(let ((prefix (option-ref options 'prefix ""))) (let ((prefix (option-ref options 'prefix "")))