Merge branch 'staging' into core-updates

3 files changed, 11 insertions, 13 deletions

diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm
index 74901b3478..e38213e8e0 100644
--- a/guix/build-system/scons.scm
+++ b/guix/build-system/scons.scm
@@ -45,8 +45,8 @@
 (define (default-scons)
   "Return the default SCons package."
   ;; Lazily resolve the binding to avoid a circular dependency.
-  (let ((python (resolve-interface '(gnu packages python-xyz))))
-    (module-ref python 'scons)))
+  (let ((build-tools (resolve-interface '(gnu packages build-tools))))
+    (module-ref build-tools 'scons)))
 
 (define* (lower name
                 #:key source inputs native-inputs outputs system target
diff --git a/guix/gexp.scm b/guix/gexp.scm
index ef92223048..73595a216b 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -2140,8 +2140,8 @@ Call RESOLVE-COLLISION when several files collide, passing it the list of
 colliding files.  RESOLVE-COLLISION must return the chosen file or #f, in
 which case the colliding entry is skipped altogether.
 
-When HARD-LINKS? is true, create hard links instead of symlinks.  When QUIET?
-is true, the derivation will not print anything."
+When COPY? is true, copy files instead of creating symlinks.  When QUIET?  is
+true, the derivation will not print anything."
   (define symlink
     (if copy?
         (gexp (lambda (old new)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index be6e839941..443e9d3282 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -1046,6 +1046,10 @@ Some ACTIONS support additional ARGS.\n"))
                          for 'describe' and 'list-generations', list installed
                          packages matching REGEXP"))
   (newline)
+  (show-cross-build-options-help)
+  (newline)
+  (show-native-build-options-help)
+  (newline)
   (display (G_ "
   -h, --help             display this help and exit"))
   (display (G_ "
@@ -1136,14 +1140,6 @@ Some ACTIONS support additional ARGS.\n"))
                    (let ((level (string->number* arg)))
                      (alist-cons 'verbosity level
                                  (alist-delete 'verbosity result)))))
-         (option '(#\s "system") #t #f
-                 (lambda (opt name arg result)
-                   (alist-cons 'system arg
-                               (alist-delete 'system result eq?))))
-         (option '("target") #t #f
-                 (lambda (opt name arg result)
-                   (alist-cons 'target arg
-                               (alist-delete 'target result eq?))))
          (option '(#\r "root") #t #f
                  (lambda (opt name arg result)
                    (alist-cons 'gc-root arg result)))
@@ -1153,7 +1149,9 @@ Some ACTIONS support additional ARGS.\n"))
          (option '(#\I "list-installed") #f #t
                  (lambda (opt name arg result)
                    (alist-cons 'list-installed (or arg "") result)))
-         %standard-build-options))
+         (append %standard-build-options
+                 %standard-cross-build-options
+                 %standard-native-build-options)))
 
 (define %default-options
   ;; Alist of default option values.