X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcold%2Fchill.lisp;h=11566980f766059b6e119410d83cb4c5e1aa8270;hb=6c296da561efd25c22e051a1e55080d9689f3ecc;hp=3f95a41f9f29afe9e55cbd8a54ab12d5b2f9f71b;hpb=8494caf7ada0504fe40036a507cf7eafb4945311;p=sbcl.git

diff --git a/src/cold/chill.lisp b/src/cold/chill.lisp
index 3f95a41..1156698 100644
--- a/src/cold/chill.lisp
+++ b/src/cold/chill.lisp
@@ -20,7 +20,7 @@
 (in-package "SB-COLD")
 
 ;;; We need the #! readtable modifications.
-(load "src/cold/shebang.lisp")
+(load (merge-pathnames "shebang.lisp" *load-truename*))
 
 ;;; #!+ and #!- now refer to *FEATURES* values (as opposed to the way
 ;;; that they referred to special target-only *SHEBANG-FEATURES* values
@@ -29,19 +29,23 @@
 ;;; Just in case we want to play with the initial value of
 ;;; backend-subfeatures
 (setf sb-cold:*shebang-backend-subfeatures* sb-c:*backend-subfeatures*)
-;;; The nickname SB!XC now refers to the CL package.
-(rename-package "COMMON-LISP"
-		"COMMON-LISP"
-		(cons "SB!XC" (package-nicknames "CL")))
 
-;;; Any other name SB!FOO refers to the package now called SB-FOO.
-(dolist (package (list-all-packages))
-  (let ((name (package-name package))
-	(nicknames (package-nicknames package))
-	(warm-name-prefix "SB-")
-	(cold-name-prefix "SB!"))
-    (when (and (> (length name) (length warm-name-prefix))
-	       (string= name warm-name-prefix :end1 (length warm-name-prefix)))
-      (let* ((stem (subseq name (length cold-name-prefix)))
-	     (cold-name (concatenate 'simple-string cold-name-prefix stem)))
-	(rename-package package name (cons cold-name nicknames))))))
+(handler-bind ((sb-ext:package-locked-error #'continue))
+  ;; The nickname SB!XC now refers to the CL package.
+  (rename-package "COMMON-LISP" "COMMON-LISP"
+                  (cons "SB!XC" (package-nicknames "CL")))
+  (sb-ext:unlock-package "CL")
+
+  ;; Any other name SB!FOO refers to the package now called SB-FOO.
+  (dolist (package (list-all-packages))
+    (let ((name (package-name package))
+          (nicknames (package-nicknames package))
+          (warm-name-prefix "SB-")
+          (cold-name-prefix "SB!"))
+      (when (and (> (length name) (length warm-name-prefix))
+                 (string= name warm-name-prefix
+                          :end1 (length warm-name-prefix)))
+        (let* ((stem (subseq name (length cold-name-prefix)))
+               (cold-name (concatenate 'simple-string cold-name-prefix stem)))
+          (rename-package package name (cons cold-name nicknames)))
+        (sb-ext:unlock-package package)))))