|
Lines 2074-2080
Link Here
|
| 2074 |
dnl Checks that javac is gcj |
2074 |
dnl Checks that javac is gcj |
| 2075 |
dnl =================================================================== |
2075 |
dnl =================================================================== |
| 2076 |
if test "$SOLAR_JAVA" != ""; then |
2076 |
if test "$SOLAR_JAVA" != ""; then |
| 2077 |
if test `$JAVACOMPILER --version 2>&1 | grep -c "GCC"` -gt 0; then |
2077 |
if test "$javacompiler" = "gcj"; then |
| 2078 |
JAVACISGCJ="yes" |
2078 |
JAVACISGCJ="yes" |
| 2079 |
fi |
2079 |
fi |
| 2080 |
fi |
2080 |
fi |
|
Lines 4624-4630
Link Here
|
| 4624 |
</project> |
4624 |
</project> |
| 4625 |
EOF |
4625 |
EOF |
| 4626 |
oldJAVA_HOME=$JAVA_HOME |
4626 |
oldJAVA_HOME=$JAVA_HOME |
| 4627 |
if test "$JDK" = "gcj"; then |
4627 |
if test "$javacompiler" = "gcj"; then |
| 4628 |
JAVA_HOME=; export JAVA_HOME |
4628 |
JAVA_HOME=; export JAVA_HOME |
| 4629 |
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2" |
4629 |
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2" |
| 4630 |
else |
4630 |
else |