Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 172594
Collapse All | Expand All

(-)/usr/portage/eclass/java-utils-2.eclass_BEFORE (-7 / +4 lines)
Lines 1573-1579 Link Here
1573
java-pkg_get-javac() {
1573
java-pkg_get-javac() {
1574
	debug-print-function ${FUNCNAME} $*
1574
	debug-print-function ${FUNCNAME} $*
1575
1575
1576
1576
	java-pkg_init-compiler_
1577
	local compiler="${GENTOO_COMPILER}"
1577
	local compiler="${GENTOO_COMPILER}"
1578
1578
1579
	local compiler_executable
1579
	local compiler_executable
Lines 1592-1609 Link Here
1592
			export JAVAC=${old_javac}
1592
			export JAVAC=${old_javac}
1593
1593
1594
			if [[ -z ${compiler_executable} ]]; then
1594
			if [[ -z ${compiler_executable} ]]; then
1595
				echo "JAVAC is empty or undefined in ${compiler_env}"
1595
				die "JAVAC is empty or undefined in ${compiler_env}"
1596
				return 1
1597
			fi
1596
			fi
1598
1597
1599
			# check that it's executable
1598
			# check that it's executable
1600
			if [[ ! -x ${compiler_executable} ]]; then
1599
			if [[ ! -x ${compiler_executable} ]]; then
1601
				echo "${compiler_executable} doesn't exist, or isn't executable"
1600
				die "${compiler_executable} doesn't exist, or isn't executable"
1602
				return 1
1603
			fi
1601
			fi
1604
		else
1602
		else
1605
			echo "Could not find environment file for ${compiler}"
1603
			die "Could not find environment file for ${compiler}"
1606
			return 1
1607
		fi
1604
		fi
1608
	fi
1605
	fi
1609
	echo ${compiler_executable}
1606
	echo ${compiler_executable}

Return to bug 172594