mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-16 06:12:25 -08:00
Code Issues Projects Releases Packages Wiki Activity

In cmpos-features.lsp, when one of the tests fails, do not stop building.

Browse source
This commit is contained in:
Juan Jose Garcia Ripoll 2011-05-28 22:38:28 +02:00
parent 1f14b45350
commit 0ff6a0b816
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/cmp/cmpos-features.lsp
View file

@ -18,16 +18,20 @@
(loop for line = (read-line stream nil nil)
while line
collect line)))
(multiple-value-bind (stream process)
(ext:run-program command args :input nil :output :stream :error :output)
(let ((lines (collect-lines stream)))
(cond ((null file)
lines)
((probe-file file)
(with-open-file (s file :direction :input)
(collect-lines s)))
(t
(warn "Unable to find file ~A" file)))))))
(handler-case
(multiple-value-bind (stream process)
(ext:run-program command args :input nil :output :stream :error :output)
(let ((lines (collect-lines stream)))
(cond ((null file)
lines)
((probe-file file)
(with-open-file (s file :direction :input)
(collect-lines s)))
(t
(warn "Unable to find file ~A" file)))))
(error (c)
(format t "~&;;; Unable to execute program ~S~&;;; Condition~&;;; ~A"
command c)))))
(defun split-words (string)
(loop with output = '()
@ -125,8 +129,8 @@ we are currently using with ECL."
(gather-keywords (apply #'run-and-collect args) +known-keywords+))
(defun gather-system-features (&key (executable
#+windows "sys:ecl_min.exe"
#-windows "sys:ecl_min"))
#+(or windows cygwin) "sys:ecl_min.exe"
#-(or windows cygwin) "sys:ecl_min"))
(let* ((ecl-binary (namestring (truename executable)))
(executable-features
#-windows
@ -145,7 +149,9 @@ we are currently using with ECL."
#+ecl-min
(update-compiler-features
:executable #+windows "build:ecl_min.exe" #-windows "build:ecl_min")
:executable
#+(or windows cygwin) "build:ecl_min.exe"
#-(or windows cygwin) "build:ecl_min")
#+ecl-min
(format t "~%;;; System features: ~A" *compiler-features*)