Remove gcj support from build system.

Change-Id: I79fe046ff8c932c5f6a9a5f70970168e42d23702 Reviewed-on: https://gerrit.libreoffice.org/28406 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
author: Thorsten Behrens <Thorsten.Behrens@CIB.de> 2016-08-26 14:31:52 +0200
committer: Thorsten Behrens <Thorsten.Behrens@CIB.de> 2016-08-26 21:44:46 +0000
commit: 7fe8c0b852fa421fe52de99a7f59e45027139eed (patch)
tree: 2fcfde3302d0b13615ad030c1ae7599111bb62d6
parent: daafd2ddaf019da11f4d0474b1840ad708a3199c (diff)
18 files changed, 52 insertions, 136 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index 0ebdb8fa1cef..6094c7ccf08f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -289,7 +289,6 @@ export INSTDIR_FOR_BUILD=@INSTDIR_FOR_BUILD@
 export INSTROOT=@INSTROOT@
 export INSTROOT_FOR_BUILD=@INSTROOT_FOR_BUILD@
 export IWYU_PATH=@IWYU_PATH@
-export JAVACISGCJ=@JAVACISGCJ@
 export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
 export JAVADOCISGJDOC=@JAVADOCISGJDOC@
diff --git a/configure.ac b/configure.ac
index 4fa48008f03b..0cf2dba4cb09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6896,11 +6896,7 @@ if test "$ENABLE_JAVA" != ""; then
         if test `$JAVAINTERPRETER -version 2>&1 | $GREP -c "Kaffe"` -gt 0; then
             AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.ac])
         elif test `$JAVAINTERPRETER --version 2>&1 | $GREP -c "GNU libgcj"` -gt 0; then
-            JDK=gcj
-            AC_MSG_RESULT([checked (gcj)])
-            _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`
-            _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-
+            AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.ac])
         elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "BEA"` -gt 0; then
             AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.ac])
         elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "IBM"` -gt 0; then
@@ -6951,7 +6947,7 @@ you must use the "--with-jdk-home" configure option explicitly])
             JAVAFLAGS=-J-Xmx128M
         fi
     else
-        AC_MSG_ERROR([Java not found. You need at least jdk-1.5, or gcj-4])
+        AC_MSG_ERROR([Java not found. You need at least jdk-1.6])
     fi
 else
     dnl Java disabled
@@ -6976,11 +6972,7 @@ dnl ===================================================================
 dnl Checks for javac
 dnl ===================================================================
 if test "$ENABLE_JAVA" != ""; then
-    if test "$JDK" = "gcj"; then
-        javacompiler=`echo $with_java | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-    else
-        javacompiler="javac"
-    fi
+    javacompiler="javac"
     if test -z "$with_jdk_home"; then
         AC_PATH_PROG(JAVACOMPILER, $javacompiler)
     else
@@ -6999,25 +6991,7 @@ if test "$ENABLE_JAVA" != ""; then
         fi
         JAVACOMPILER=`win_short_path_for_make "$JAVACOMPILER"`
     fi
-
-    if test `$JAVACOMPILER -version 2>&1 | $GREP -c "Eclipse Java Compiler"` -gt 0; then
-        AC_MSG_CHECKING([re-checking JDK])
-        JDK=gcj
-        AC_MSG_RESULT([checked (ecj)])
-        _gij_longver="40200"
-    fi
-fi
-
-JAVACISGCJ=""
-dnl ===================================================================
-dnl Checks that javac is gcj
-dnl ===================================================================
-if test "$ENABLE_JAVA" != ""; then
-    if test `$JAVACOMPILER --version 2>&1 | $GREP -c "GCC"` -gt 0; then
-        JAVACISGCJ="yes"
-    fi
 fi
-AC_SUBST(JAVACISGCJ)
 
 dnl ===================================================================
 dnl Checks for javadoc
@@ -7134,24 +7108,21 @@ _ACEOF
         fi
     fi
 
-    dnl second sanity check JAVA_HOME if possible
-    if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
-        # now check if $JAVA_HOME is really valid
-        if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then
-            if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
-                JAVA_HOME_OK="NO"
-            fi
-        elif test ! -d "$JAVA_HOME/jre" -a "x$with_jdk_home" = "x"; then
+    # now check if $JAVA_HOME is really valid
+    if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then
+        if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
             JAVA_HOME_OK="NO"
         fi
-        if test "$JAVA_HOME_OK" = "NO"; then
-            AC_MSG_WARN([JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script])
-            AC_MSG_WARN([attempted to find JAVA_HOME automatically, but apparently it failed])
-            AC_MSG_WARN([in case JAVA_HOME is incorrectly set, some projects with not be built correctly])
-            add_warning "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script"
-            add_warning "attempted to find JAVA_HOME automatically, but apparently it failed"
-            add_warning "in case JAVA_HOME is incorrectly set, some projects with not be built correctly"
-        fi
+    elif test ! -d "$JAVA_HOME/jre" -a "x$with_jdk_home" = "x"; then
+        JAVA_HOME_OK="NO"
+    fi
+    if test "$JAVA_HOME_OK" = "NO"; then
+        AC_MSG_WARN([JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script])
+        AC_MSG_WARN([attempted to find JAVA_HOME automatically, but apparently it failed])
+        AC_MSG_WARN([in case JAVA_HOME is incorrectly set, some projects with not be built correctly])
+        add_warning "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script"
+        add_warning "attempted to find JAVA_HOME automatically, but apparently it failed"
+        add_warning "in case JAVA_HOME is incorrectly set, some projects with not be built correctly"
     fi
     PathFormat "$JAVA_HOME"
     JAVA_HOME="$formatted_path"
@@ -12080,12 +12051,7 @@ EOF
         </project>
 EOF
 
-        oldJAVA_HOME=$JAVA_HOME
-        if test "$JAVACISGCJ" = "yes"; then
-            JAVA_HOME=; export JAVA_HOME
-            ant_gcj="-Dbuild.compiler=gcj"
-        fi
-        AC_TRY_COMMAND("$ANT" $ant_gcj -buildfile conftest.xml 1>&2)
+        AC_TRY_COMMAND("$ANT" -buildfile conftest.xml 1>&2)
         if test $? = 0 -a -f ./conftest.class; then
             AC_MSG_RESULT([Ant works])
             if test -z "$WITH_ANT_HOME"; then
@@ -12104,7 +12070,6 @@ EOF
             ANT_HOME=""
             add_warning "Ant does not work - Some Java projects will not build!"
         fi
-        JAVA_HOME=$oldJAVA_HOME
         rm -f conftest* core core.* *.core
     fi
     if test -z "$ANT_HOME"; then
@@ -12997,7 +12962,7 @@ else
     case "$host_os" in
 
     aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
-        if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then
+        if test "$ENABLE_JAVA" != ""; then
             pathmunge "$JAVA_HOME/bin" "after"
         fi
         ;;
@@ -13036,7 +13001,7 @@ else
             pathmunge "$COMPATH/bin" "before"
             pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before"
         fi
-        if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then
+        if test "$ENABLE_JAVA" != ""; then
             if test -d "$JAVA_HOME/jre/bin/client"; then
                 pathmunge "$JAVA_HOME/jre/bin/client" "before"
             fi
@@ -13049,7 +13014,7 @@ else
 
     solaris*)
         pathmunge "/usr/css/bin" "before"
-        if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then
+        if test "$ENABLE_JAVA" != ""; then
             pathmunge "$JAVA_HOME/bin" "after"
         fi
         ;;
diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk
index ed9e53646f18..d260e19dc34e 100644
--- a/external/apache-commons/ExternalProject_apache_commons_logging.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk
@@ -20,11 +20,8 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
+		-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+		-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 		$(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \
 		compile build-jar \
 	)
diff --git a/external/beanshell/ExternalProject_beanshell.mk b/external/beanshell/ExternalProject_beanshell.mk
index 889b79b153d2..62ac1f9df3b2 100644
--- a/external/beanshell/ExternalProject_beanshell.mk
+++ b/external/beanshell/ExternalProject_beanshell.mk
@@ -19,11 +19,8 @@ $(call gb_ExternalProject_get_state_target,beanshell,build) :
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
+		-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+		-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 		$(if $(debug),-Dbuild.debug="on") \
 	)
 
diff --git a/external/hsqldb/ExternalProject_hsqldb.mk b/external/hsqldb/ExternalProject_hsqldb.mk
index c32a2bfc6129..2f7a08e7ea73 100644
--- a/external/hsqldb/ExternalProject_hsqldb.mk
+++ b/external/hsqldb/ExternalProject_hsqldb.mk
@@ -19,11 +19,8 @@ $(call gb_ExternalProject_get_state_target,hsqldb,build) :
 			-q \
 			-f build/build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			$(if $(debug),-Dbuild.debug="on") \
 			jar \
 	)
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index ec732e6ec342..e220cc20a56b 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -32,11 +32,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
 			-Dlibloader.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)/dist/libloader-$(LIBLOADER_VERSION).jar \
 			-Dlibserializer.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar \
 			-Dlibxml.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
 
diff --git a/external/jfreereport/ExternalProject_jfreereport_flute.mk b/external/jfreereport/ExternalProject_jfreereport_flute.mk
index f2a559c649ef..0620101e7242 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flute.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flute.mk
@@ -22,11 +22,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flute,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
 			-Dbuild.id="10682" \
 			-Dproject.revision="$(FLUTE_VERSION)" \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libbase.mk b/external/jfreereport/ExternalProject_jfreereport_libbase.mk
index 8f1ec0884777..2ae4b9c6fcca 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libbase.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libbase.mk
@@ -22,11 +22,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
 			-Dbuild.id="10682" \
 			-Dproject.revision="$(LIBBASE_VERSION)" \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
index ad38cd98ca18..338fbbd5c8fc 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
@@ -22,11 +22,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
 			-Dbuild.id="10682" \
 			-Dproject.revision="$(LIBFONTS_VERSION)" \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libformula.mk b/external/jfreereport/ExternalProject_jfreereport_libformula.mk
index 90d8b4d7da8f..6acebfb9b461 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libformula.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libformula.mk
@@ -22,11 +22,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
 			-Dbuild.id="10682" \
 			-Dproject.revision="$(LIBFORMULA_VERSION)" \
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index 751b8939995c..0789a5475219 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -47,11 +47,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
 			-Dlibserializer.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar \
 			-Dlibxml.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar \
 			-Dsac.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_sac)/build/lib/sac.jar \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
 			-Dbuild.id="10682" \
 			$(if $(debug),-Dbuild.debug="on") jar \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libloader.mk b/external/jfreereport/ExternalProject_jfreereport_libloader.mk
index 2b860b8aa7a6..f2586c3caabb 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libloader.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libloader.mk
@@ -22,11 +22,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
 			-Dbuild.id="10682" \
 			-Dproject.revision="$(LIBLOADER_VERSION)" \
diff --git a/external/jfreereport/ExternalProject_jfreereport_librepository.mk b/external/jfreereport/ExternalProject_jfreereport_librepository.mk
index 21611e45ccd9..360d6c7a88e6 100644
--- a/external/jfreereport/ExternalProject_jfreereport_librepository.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_librepository.mk
@@ -22,11 +22,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
 			-Dbuild.id="10682" \
 			-Dproject.revision="$(LIBREPOSITORY_VERSION)" \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
index 2b0c951a7227..d4ea7024989e 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
@@ -22,11 +22,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)." \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
 			-Dbuild.id="10682" \
 			-Dproject.revision="$(LIBSERIALIZER_VERSION)" \
diff --git a/external/jfreereport/ExternalProject_jfreereport_libxml.mk b/external/jfreereport/ExternalProject_jfreereport_libxml.mk
index 0cb2d7e38a5b..86c42bce32b1 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libxml.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libxml.mk
@@ -22,11 +22,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
 			-Dbuild.id="10682" \
 			-Dproject.revision="$(LIBXML_VERSION)" \
diff --git a/external/jfreereport/ExternalProject_jfreereport_sac.mk b/external/jfreereport/ExternalProject_jfreereport_sac.mk
index 72783a175317..35a0c9ddc2a2 100644
--- a/external/jfreereport/ExternalProject_jfreereport_sac.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_sac.mk
@@ -19,11 +19,8 @@ $(call gb_ExternalProject_get_state_target,jfreereport_sac,build) :
 			-q \
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			-Dantcontrib.available="true" \
 			$(if $(debug),-Dbuild.debug="on") all \
 	)
diff --git a/external/languagetool/ExternalProject_languagetool.mk b/external/languagetool/ExternalProject_languagetool.mk
index 20ebdf576fec..6b3788d12e93 100644
--- a/external/languagetool/ExternalProject_languagetool.mk
+++ b/external/languagetool/ExternalProject_languagetool.mk
@@ -26,11 +26,8 @@ $(call gb_ExternalProject_get_state_target,languagetool,build) :
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
+		-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+		-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 		$(if $(debug),-Dbuild.debug="on") \
 		-Dext.ooo.juh.lib="$(call gb_Jar_get_target,juh)" \
 		-Dext.ooo.jurt.lib="$(call gb_Jar_get_target,jurt)" \
diff --git a/external/rhino/ExternalProject_rhino.mk b/external/rhino/ExternalProject_rhino.mk
index 3243ad93d538..4f6cab6c873d 100644
--- a/external/rhino/ExternalProject_rhino.mk
+++ b/external/rhino/ExternalProject_rhino.mk
@@ -20,11 +20,8 @@ $(call gb_ExternalProject_get_state_target,rhino,build) :
 			-f build.xml \
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 			-DTARFILE_LOCATION="$(if $(findstring -cygwin,$(BUILD_PLATFORM)),$(shell cygpath -m $(TARFILE_LOCATION)),$(TARFILE_LOCATION))" \
-			$(if $(filter yes,$(JAVACISGCJ))\
-				,-Dbuild.compiler=gcj \
-				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
-			) \
+			-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			$(if $(debug),-Dbuild.debug="on") \
 			jar \
 	)
author	Thorsten Behrens <Thorsten.Behrens@CIB.de>	2016-08-26 14:31:52 +0200
committer	Thorsten Behrens <Thorsten.Behrens@CIB.de>	2016-08-26 21:44:46 +0000
commit	7fe8c0b852fa421fe52de99a7f59e45027139eed (patch)
tree	2fcfde3302d0b13615ad030c1ae7599111bb62d6
parent	daafd2ddaf019da11f4d0474b1840ad708a3199c (diff)