02/04: gnu: ant-bootstrap: Set environment variables in a separate phase.

[guix-commits]

civodul pushed a commit to branch core-updates-frozen
in repository guix.

commit 06247e465f98300ddc69a5384b103c8c1b9a866a
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Sep 1 15:33:06 2021 +0200

    gnu: ant-bootstrap: Set environment variables in a separate phase.
    
    * gnu/packages/java.scm (ant-bootstrap)[arguments]: Move 'setenv' calls
    to new 'define-java-environment-variables' phase.
---
 gnu/packages/java.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a0b749a..ed8c0c7 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -360,16 +360,15 @@ JNI.")
        (modify-phases %standard-phases
          (delete 'bootstrap)
          (delete 'configure)
-         (replace 'build
+         (add-before 'build 'define-java-environment-variables
            (lambda* (#:key inputs #:allow-other-keys)
+             ;; First, set environment variables (eases debugging on -K).
              (setenv "JAVA_HOME" (assoc-ref inputs "jamvm"))
-             (setenv "JAVACMD"
-                     (search-input-file inputs "/bin/jamvm"))
-             (setenv "JAVAC"
-                     (search-input-file inputs "/bin/jikes"))
-             (setenv "CLASSPATH"
-                     (search-input-file inputs "/lib/rt.jar"))
-
+             (setenv "JAVACMD" (search-input-file inputs "/bin/jamvm"))
+             (setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
+             (setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
+         (replace 'build
+           (lambda* (#:key inputs #:allow-other-keys)
              ;; Ant complains if this file doesn't exist.
              (setenv "HOME" "/tmp")
              (with-output-to-file "/tmp/.ant.properties"