diff options
| 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 /external/rhino | |
| parent | daafd2ddaf019da11f4d0474b1840ad708a3199c (diff) | |
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>
Diffstat (limited to 'external/rhino')
| -rw-r--r-- | external/rhino/ExternalProject_rhino.mk | 7 |
1 files changed, 2 insertions, 5 deletions
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 \ ) |