02/04: gnu: icedtea-7: Fix build on i686-linux.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 1b6f99ea538d767099596860017e67755c1ac42f
Author: Ricardo Wurmus <address@hidden>
Date:   Fri Oct 4 10:36:29 2019 +0200

    gnu: icedtea-7: Fix build on i686-linux.
    
    * gnu/packages/java.scm (icedtea-7)[arguments]: Use "i386" lib directory 
when
    the system is "i686-linux".
---
 gnu/packages/java.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index aa624b4..3b74049 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1376,7 +1376,12 @@ bootstrapping purposes.")
            (add-after 'install 'install-libjvm
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let* ((lib-path (string-append (assoc-ref outputs "out")
-                                               "/lib/amd64")))
+                                               "/lib/"
+                                               ,(match (%current-system)
+                                                  ("i686-linux"
+                                                   "i386")
+                                                  ("x86_64-linux"
+                                                   "amd64")))))
                  (symlink (string-append lib-path "/server/libjvm.so")
                           (string-append lib-path "/libjvm.so")))
                #t))