diff --git a/collects/compiler/cm-accomplice.ss b/collects/compiler/cm-accomplice.ss deleted file mode 100644 index 9cf2b293a9..0000000000 --- a/collects/compiler/cm-accomplice.ss +++ /dev/null @@ -1,5 +0,0 @@ -#lang scheme/base - -(require mzlib/cm-accomplice) - -(provide (all-from-out mzlib/cm-accomplice)) diff --git a/collects/compiler/cm.ss b/collects/compiler/cm.ss deleted file mode 100644 index fb85ff0bf9..0000000000 --- a/collects/compiler/cm.ss +++ /dev/null @@ -1,5 +0,0 @@ -#lang scheme/base - -(require mzlib/cm) - -(provide (all-from-out mzlib/cm)) diff --git a/collects/mzlib/private/cm-ctime.ss b/collects/compiler/private/cm-ctime.ss similarity index 100% rename from collects/mzlib/private/cm-ctime.ss rename to collects/compiler/private/cm-ctime.ss diff --git a/collects/mzlib/cm-accomplice.ss b/collects/mzlib/cm-accomplice.ss index 6d7e07eb9c..6ab7898895 100644 --- a/collects/mzlib/cm-accomplice.ss +++ b/collects/mzlib/cm-accomplice.ss @@ -9,10 +9,10 @@ ;; Load the code in a separate thread, so that the dynamic ;; extent of this one (likely a phase-sensitive macro expansion) ;; doesn't pollute the load: - (thread-wait + (thread-wait (thread (lambda () (set! param - (dynamic-require 'mzlib/private/cm-ctime + (dynamic-require 'compiler/private/cm-ctime 'current-external-file-registrar))))) ((param) f)))) diff --git a/collects/mzlib/cm.ss b/collects/mzlib/cm.ss index 4c9e151a2b..3ab9f034de 100644 --- a/collects/mzlib/cm.ss +++ b/collects/mzlib/cm.ss @@ -114,7 +114,7 @@ (define param ;; Avoid using cm while loading cm-ctime: (parameterize ([use-compiled-file-paths null]) - (dynamic-require 'mzlib/private/cm-ctime + (dynamic-require 'compiler/private/cm-ctime 'current-external-file-registrar))) (define external-deps null) (define (external-dep! p)