2 files changed, 6 insertions(+), 4 deletions(-)

M doc/guix.texi
M guix/scripts/build.scm

@@ 13714,7 13714,7 @@ (gnu packages guile) guile-2.0)'
 
 If a log is unavailable locally, and unless @option{--no-substitutes} is
 passed, the command looks for a corresponding log on one of the
-substitute servers (as specified with @option{--substitute-urls}).
+substitute servers.
 
 So for instance, imagine you want to see the build log of GDB on
 @code{aarch64}, but you are actually on an @code{x86_64} machine:

@@ 763,9 763,11 @@ needed."
                    (urls  (map (cut string-append <> "/log")
                                (if (assoc-ref opts 'substitutes?)
                                    (or (assoc-ref opts 'substitute-urls)
-                                       ;; XXX: This does not necessarily match the
-                                       ;; daemon's substitute URLs.
-                                       %default-substitute-urls)
+                                       (substitute-urls store)
+                                       (begin
+                                         (warning (G_ "could not determine current \
+substitute URLs; using defaults~%"))
+                                         %default-substitute-urls))
                                    '())))
                    (items (filter-map (match-lambda
                                         (('argument . (? store-path? file))