guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

12/12: syscalls: Consistently use existing linux? definition.


From: guix-commits
Subject: 12/12: syscalls: Consistently use existing linux? definition.
Date: Mon, 23 Oct 2023 05:58:51 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit dae956e7961ea4940a3823a7b33f8264196ca594
Author: Sören Tempel <soeren@soeren-tempel.net>
AuthorDate: Sun Sep 17 17:21:48 2023 +0200

    syscalls: Consistently use existing linux? definition.
    
    Instead of duplicating this existing logic across the source file. This
    will make it easier to add additional linux targets (e.g. linux-musl) in
    the future.
    
    * guix/build/syscalls.scm (readdir*, write-socket-address!)
    (read-socket-address): Use linux? constant.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
    Change-Id: I833c1d1630dcb8319584de1ea918cb22696f0058
---
 guix/build/syscalls.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index e02ed07cd4..b845b8aab9 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -1245,7 +1245,7 @@ system to PUT-OLD."
 
 (define readdir*
   ;; Decide at run time which one must be used.
-  (if (string-contains %host-type "linux-gnu")
+  (if linux?
       (readdir-procedure (c-struct-field-offset %struct-dirent-header/linux
                                                 name)
                          sizeof-dirent-header/linux
@@ -1665,7 +1665,7 @@ bytevector BV at INDEX."
            (error "unsupported socket address" sockaddr)))))
 
 (define write-socket-address!
-  (if (string-contains %host-type "linux-gnu")
+  (if linux?
       write-socket-address!/linux
       write-socket-address!/hurd))
 
@@ -1697,7 +1697,7 @@ bytevector BV at INDEX."
            (vector family)))))
 
 (define read-socket-address
-  (if (string-contains %host-type "linux-gnu")
+  (if linux?
       read-socket-address/linux
       read-socket-address/hurd))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]