1 files changed, 7 insertions, 0 deletions

diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index fdb974bde86..b0a427698fa 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -169,6 +169,13 @@ build daemon, from within the generated build program."
                            ;; build output.
                            (connect sock AF_UNIX build-output)
 
+                           (when (integer? proto)
+                             ;; port->connection doesn't setup buffering, so
+                             ;; do this here
+                             (setvbuf (store-connection-socket store)
+                                      'block
+                                      %default-store-connection-buffer-size))
+
                            (display
                             (and=>
                              ;; Silence autoload warnings and the likes.