diff --git a/src/tools/worldbuild.lisp b/src/tools/worldbuild.lisp index a654b449c30b56bef508de336e34fe82a03e3775..cb2b6353aaa482eb8c3bf470982e635a05012814 100644 --- a/src/tools/worldbuild.lisp +++ b/src/tools/worldbuild.lisp @@ -121,9 +121,12 @@ "target:code/scavhook" "target:code/save" - ,@(if (c:backend-featurep :random-mt19937) - '("target:code/rand-mt19937") - '("target:code/rand")) + ,@(cond ((c:backend-featurep :random-mt19937) + '("target:code/rand-mt19937")) + ((c:backend-featurep :random-xoroshiro) + '("target:code/rand-xoroshiro")) + (t + '("target:code/rand"))) "target:code/rand-xoroshiro" "target:code/alieneval" "target:code/c-call" diff --git a/src/tools/worldcom.lisp b/src/tools/worldcom.lisp index 8c2c8a821e0b0392e365d6446e34b7891f66378e..1a5ee5b69f55509a9cc29538a2f7c3c4e2b3c6b0 100644 --- a/src/tools/worldcom.lisp +++ b/src/tools/worldcom.lisp @@ -268,10 +268,12 @@ (comf "target:code/debug" :byte-compile t) (comf "target:code/query" :byte-compile *byte-compile*) -(if (c:backend-featurep :random-mt19937) - (comf "target:code/rand-mt19937") - (comf "target:code/rand")) -(comf "target:code/rand-xoroshiro") +(cond ((c:backend-featurep :random-mt19937) + (comf "target:code/rand-mt19937")) + ((c:backend-featurep :random-xoroshiro) + (comf "target:code/rand-xoroshiro")) + (t + (comf "target:code/rand"))) (comf "target:code/ntrace" :byte-compile *byte-compile*) (comf "target:code/profile") (comf "target:code/sort") diff --git a/src/tools/worldload.lisp b/src/tools/worldload.lisp index b85332be392f55d96b84a7bb17b7842361053c77..16365e7878bdede57093f6ee6ef284b8b1e47814 100644 --- a/src/tools/worldload.lisp +++ b/src/tools/worldload.lisp @@ -96,8 +96,12 @@ (maybe-byte-load "code:time") (maybe-byte-load "code:tty-inspect") (maybe-byte-load "code:describe") -#+random-mt19937 (maybe-byte-load "code:rand-mt19937") -#-random-mt19937 (maybe-byte-load "code:rand") +#+random-mt19937 +(maybe-byte-load "code:rand-mt19937") +#+random-xoroshiro +(maybe-byte-load "code:rand-xoroshiro") +#-(or random-mt19937 random-xoroshiro) +(maybe-byte-load "code:rand") (maybe-byte-load "code:rand-xoroshiro") (maybe-byte-load "target:pcl/walk") (maybe-byte-load "code:fwrappers")