diff options
| -rw-r--r-- | gnu/packages/base.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/bootstrap.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/cross-base.scm | 8 |
3 files changed, 14 insertions, 5 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 90c25b54e1..02ef71f20d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1079,7 +1079,7 @@ the store.") (string-append locale "/C.UTF-8"))))) ,@(if (target-hurd?) - '((add-after 'install 'augment-libc.so + `((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* (string-append out "/lib/libc.so") @@ -1089,7 +1089,12 @@ the store.") (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (cpu "i386") + (cpu ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) (machine (string-append out "/include/mach/machine"))) (unless (file-exists? machine) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 33cbaa30ae..27798fe278 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -311,7 +311,7 @@ or false to signal an error." gnu-triplet->nix-system) (%current-system)))) "Return the name of Glibc's dynamic linker for SYSTEM." - ;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc. + ;; See the appropriate 'shlib-versions' file in libc. (let ((platform (false-if-platform-not-found (lookup-platform-by-system system)))) (cond diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 83672ab383..4961b3b4c0 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -738,7 +738,7 @@ returned." (delete 'install-utf8-c-locale) ,@(if (target-hurd? target) - '((add-after 'install 'augment-libc.so + `((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* (string-append out "/lib/libc.so") @@ -748,7 +748,11 @@ returned." (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (cpu "i386") + (cpu ,(match target + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) (machine (string-append out "/include/mach/machine"))) (unless (file-exists? machine) |