diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-07-01 17:17:08 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-07-01 17:17:08 +0000 |
| commit | 288f55eac0588d518e3b14d973a7d52fec5b301b (patch) | |
| tree | 2eb70bbd7cf70473b4161603e8af832dfa9d35fd /eclass/java-utils-2.eclass | |
| parent | Version bump thanks to Raine Skellr in bug #138596 (diff) | |
| download | historical-288f55eac0588d518e3b14d973a7d52fec5b301b.tar.gz historical-288f55eac0588d518e3b14d973a7d52fec5b301b.tar.bz2 historical-288f55eac0588d518e3b14d973a7d52fec5b301b.zip | |
Fix for JAVA_PKG_FORCE_COMPILER. exports JAVA and JAVAC now.
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index f32dfc6d2325..f32842b81dd8 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1326,7 +1326,13 @@ java-pkg_init-compiler_() { return fi - local compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" + local compilers; + if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then + compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" + else + compilers=${JAVA_PKG_FORCE_COMPILER} + fi + debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" # Figure out if we should announce what compiler we're using @@ -1657,6 +1663,8 @@ java-pkg_switch-vm() { java-pkg_setup-vm + export JAVA=$(java-config -java) + export JAVAC=$(java-config -javac) export JAVACFLAGS="$(java-pkg_javac-args)" [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" |