X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=build-order.lisp-expr;h=0a52508c6e145c62bb904baf22c5452a78fce4c4;hb=2db542f484283726e64dd4606e7a0f74b9b228ee;hp=70e040b0075b0cbf8f9067e00daefc4f35c5abab;hpb=a160917364f85b38dc0826a5e3dcef87e3c4c62c;p=sbcl.git

diff --git a/build-order.lisp-expr b/build-order.lisp-expr
index 70e040b..0a52508 100644
--- a/build-order.lisp-expr
+++ b/build-order.lisp-expr
@@ -160,9 +160,6 @@
  ;; accessors.)
  ("src/code/type-class")
 
- ("src/code/early-pcounter")
- ("src/code/pcounter" :not-host)
-
  ("src/code/ansi-stream" :not-host)
 
  ("src/code/sysmacs" :not-host)
@@ -601,14 +598,14 @@
  ("src/compiler/generic/late-type-vops")
 
  ;; KLUDGE: The assembly files need to be compiled twice: once as
- ;; normal lisp files, and once by sb-c:assemble-file.  We play some
- ;; symlink games to make sure we don't scribble over anything we
- ;; shouldn't, but these are actually the same files:
-
- ("src/compiler/assembly/target/assem-rtns")
- ("src/compiler/assembly/target/array")
- ("src/compiler/assembly/target/arith")
- ("src/compiler/assembly/target/alloc")
+ ;; normal lisp files, and once by sb-c:assemble-file.  We use a
+ ;; different suffix / "file type" for the :assem versions to make
+ ;; sure we don't scribble over anything we shouldn't.
+
+ ("src/assembly/target/assem-rtns")
+ ("src/assembly/target/array")
+ ("src/assembly/target/arith")
+ ("src/assembly/target/alloc")
  ("src/assembly/target/assem-rtns" :assem :not-host)
  ("src/assembly/target/array"      :assem :not-host)
  ("src/assembly/target/arith"      :assem :not-host)
@@ -689,6 +686,8 @@
  ("src/code/debug" :not-host)
 
  ("src/code/octets" :not-host)
+ ("src/code/external-formats/enc-basic" :not-host)
+ ("src/code/external-formats/enc-ebcdic" :not-host)
  #!+sb-unicode
  ("src/code/external-formats/enc-cyr" :not-host)
  #!+sb-unicode
@@ -708,7 +707,9 @@
  #!+sb-unicode
  ("src/code/external-formats/enc-jpn" :not-host)
  #!+sb-unicode
- ("src/code/external-formats/ucs-2" :not-host)
+ ("src/code/external-formats/enc-ucs" :not-host)
+ #!+sb-unicode
+ ("src/code/external-formats/enc-utf" :not-host)
 
  ;; The code here can't be compiled until CONDITION and
  ;; DEFINE-CONDITION are defined and SB!DEBUG:*STACK-TOP-HINT* is