1 files changed, 21 insertions(+), 5 deletions(-)

M distro/packages/base.scm

@@ 967,11 967,27 @@ store.")
   ;; FIXME: The Libtool used here, specifically its `bin/libtool' script,
   ;; holds a dependency on the bootstrap Binutils.  Use multiple outputs for
   ;; Libtool, so that that dependency is isolated in the "bin" output.
-  (package-with-bootstrap-guile
-   (package-with-explicit-inputs guile-2.0/fixed
-                                 %boot4-inputs
-                                 (current-source-location)
-                                 #:guile %bootstrap-guile)))
+  (let ((guile (package (inherit guile-2.0/fixed)
+                 (arguments
+                  `(#:phases
+                    (alist-cons-before
+                     'patch-source-shebangs 'delete-encoded-test
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       ;; %BOOTSTRAP-GUILE doesn't know about encodings other
+                       ;; than UTF-8.  That test declares an ISO-8859-1
+                       ;; encoding, which prevents `patch-shebang' from
+                       ;; working, so skip it.
+                       (call-with-output-file
+                           "test-suite/standalone/test-command-line-encoding2"
+                         (lambda (p)
+                           (format p "#!~a/bin/bash\nexit 77"
+                                   (assoc-ref inputs "bash")))))
+                     %standard-phases))))))
+    (package-with-bootstrap-guile
+     (package-with-explicit-inputs guile
+                                   %boot4-inputs
+                                   (current-source-location)
+                                   #:guile %bootstrap-guile))))
 
 (define-public ld-wrapper
   ;; The final `ld' wrapper, which uses the final Guile.