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>

16 files changed, 32 insertions, 80 deletions

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 \
 	)