- use "cond" instead of "case" in "canonical-machine",
- downcase OS name in "canonical-os-name".
This commit is contained in:
parent
a8b0bdd72a
commit
b8ddec939b
|
@ -1,24 +1,24 @@
|
|||
(define-structure configure (export host)
|
||||
(open scheme-with-scsh)
|
||||
(open scheme-with-scsh
|
||||
srfi-13)
|
||||
(begin
|
||||
(define (canonical-machine uname-record)
|
||||
(let* ((machine (uname:machine uname-record))
|
||||
(os (uname:os-name uname-record)))
|
||||
(case machine
|
||||
(("i386" "i486" "i586" "i686") "i386")
|
||||
(("Power Machintosh") "powerpc")
|
||||
(else (cond ((and (string=? os "AIX")
|
||||
(regexp-search? (rx (: "00" (= 6 digit) any any "00")) machine))
|
||||
(cond
|
||||
((member machine '("i386" "i486" "i586" "i686")) "i386")
|
||||
((or (string=? machine "Power Macintosh")
|
||||
(and (string=? os "AIX")
|
||||
(regexp-search? (rx (: "00" (= 6 digit) any any "00"))
|
||||
machine)))
|
||||
"powerpc")
|
||||
(else machine))))))
|
||||
(else machine))))
|
||||
|
||||
(define (canonical-os-name uname-record)
|
||||
(uname:os-name uname-record))
|
||||
(string-downcase (uname:os-name uname-record)))
|
||||
|
||||
(define (host)
|
||||
(let ((uname-record (uname)))
|
||||
(string-append (canonical-machine uname-record)
|
||||
"-"
|
||||
(canonical-os-name uname-record))))))
|
||||
|
||||
|
Loading…
Reference in New Issue