diff options
Diffstat (limited to 'hsqldb/ExternalProject_hsqldb.mk')
| -rw-r--r-- | hsqldb/ExternalProject_hsqldb.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/hsqldb/ExternalProject_hsqldb.mk b/hsqldb/ExternalProject_hsqldb.mk index 0ed22a348fb6..8cead357263b 100644 --- a/hsqldb/ExternalProject_hsqldb.mk +++ b/hsqldb/ExternalProject_hsqldb.mk @@ -16,18 +16,18 @@ $(eval $(call gb_ExternalProject_register_targets,hsqldb,\ )) $(call gb_ExternalProject_get_state_target,hsqldb,build) : - cd $(EXTERNAL_WORKDIR) && \ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build/build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter yes,$(JAVACISGCJ))\ + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -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) \ - ) \ - $(if $(debug),-Dbuild.debug="on") \ - jar && \ - touch $@ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") \ + jar \ + ) # vim: set noet sw=4 ts=4: |