solenv/gbuild/JavaClassSet.mk | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 7d7fa43c3ce3dff07023ee483bdbd685ffe03bd8
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Mar 23 15:26:35 2012 +0100
JavaClassSet: giving only changed java files to javac is bogus
(cherry picked from commit 526a31be4c31fe519c14c16241a48729dd9aa465)
Conflicts:
solenv/gbuild/JavaClassSet.mk
Signed-off-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 9104b9c..0fbb6b0 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -38,9 +38,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
$(call gb_Helper_convert_native,\
- $(if $(filter-out $(JARDEPS),$(3)),\
- $(filter-out $(JARDEPS),$(3)),\
- $(filter-out $(JARDEPS),$(4))))) && \
+ $(filter-out $(JARDEPS),$(4)))) && \
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
$(gb_JavaClassSet_JAVACDEBUG) \
-cp "$(T_CP)$(gb_CLASSPATHSEP)$(call
gb_JavaClassSet_get_classdir,$(2))" \
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
