Skip to content

Commit

Permalink
Put a compilation unit around make-host-1.
Browse files Browse the repository at this point in the history
This is an attempt to make non-SBCL build hosts happy,
in addition to being the right thing to do anyway.
Problem was that the definitions of PARSE-{DEPRECATED,UNKNOWN}-TYPE
in cross-type are superseded by the ones in late-type,
which is apparently considered an error by some.
(The ones in condition-boot are also repeats, but we don't care)
  • Loading branch information
snuglas committed Oct 17, 2015
1 parent e2475e4 commit b058176
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
3 changes: 2 additions & 1 deletion make-host-1.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
;; Supress function/macro redefinition warnings under clisp.
#+clisp (setf custom:*suppress-check-redefinition* t)

(load-or-cload-xcompiler #'host-cload-stem)
(with-compilation-unit ()
(load-or-cload-xcompiler #'host-cload-stem))

;;; Let's check that the type system, and various other things, are
;;; reasonably sane. (It's easy to spend a long time wandering around
Expand Down
9 changes: 0 additions & 9 deletions src/code/cross-condition.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,3 @@ which can be found at <http:https://sbcl.sourceforge.net/>.~:@>"
;; both of which are specified to exist.
(define-condition sb!c:inlining-dependency-failure
(simple-condition style-warning) ())

;; early-extensions seems to want to recognize these types.
;; I'm not sure that it actually can or needs to. For one thing,
;; the types didn't used to exist. More than likely the mechanism for handling
;; deprecated types doesn't actually work in the cross-compiler.
;; Anyway, the lesser evil is to make a few extra definitions rather than
;; produce a PARSE-UNKNOWN-TYPE warning in reference to PARSE-UNKNOWN-TYPE.
(define-condition parse-unknown-type () ())
(define-condition parse-deprecated-type () ())

0 comments on commit b058176

Please sign in to comment.