aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-10-04 10:36:29 +0200
committerRicardo Wurmus <rekado@elephly.net>2019-10-06 22:01:01 +0200
commit1b6f99ea538d767099596860017e67755c1ac42f (patch)
treef69f5a5fe75fd582f9de74a4ac8471785c2e7cdd
parentfc37b4afb29095e222f7ddd3fb3df1ad196926a3 (diff)
downloadguix-1b6f99ea538d767099596860017e67755c1ac42f.tar
guix-1b6f99ea538d767099596860017e67755c1ac42f.tar.gz
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".
-rw-r--r--gnu/packages/java.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index aa624b4c28..3b7404973a 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))