rhino/ExternalProject_rhino.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 2a7b3d83d682102eaf1c77d7e12e698db26fdd13 Author: Tor Lillqvist <[email protected]> Date: Mon Oct 8 17:21:08 2012 +0300 Fix build with a Cygwin path for TARFILE_LOCATION Change-Id: Ic5ff8eeaa7fb30ac3f880f0cff69119deccb2bca diff --git a/rhino/ExternalProject_rhino.mk b/rhino/ExternalProject_rhino.mk index 0ca364e..6a60393 100644 --- a/rhino/ExternalProject_rhino.mk +++ b/rhino/ExternalProject_rhino.mk @@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,rhino,build) : -q \ -f build.xml \ -Dbuild.label="build-$(RSCREVISION)" \ - -DTARFILE_LOCATION="$(TARFILE_LOCATION)" \ + -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) \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
