diff options
| -rw-r--r-- | solenv/gbuild/Jar.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 9e57be290047..4527fcfc0545 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -26,8 +26,6 @@ # #************************************************************************* -# if a jar prerequisite has changed, the ClassSet must be recompiled. How? - # Jar class gb_Jar_JAVACOMMAND := $(JAVAINTERPRETER) diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index c28875e87dfa..3f65099802f7 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -118,8 +118,6 @@ $$(call gb_Output_error,\ gb_JavaClassSet_add_jar: use gb_JavaClassSet_use_jar instead.) endef -# problem: currently we can't get these dependencies to work -# build order dependency is a hack to get these prerequisites out of the way in the build command define gb_JavaClassSet_use_jar ifneq (,$$(filter-out $(gb_Jar_KNOWN),$(2))) $$(eval $$(call gb_Output_info,currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL)) @@ -128,7 +126,6 @@ endif $(call gb_JavaClassSet_get_target,$(1)) : $(call gb_Jar_get_outdir_target,$(2)) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call gb_Jar_get_outdir_target,$(2)) $(call gb_JavaClassSet_add_classpath,$(1),$(call gb_Jar_get_outdir_target,$(2))) -$(2) :| $(gb_Helper_PHONY) endef diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 8a5ff4564321..8dbc1bfe0090 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -40,6 +40,7 @@ $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_targe ifneq (,$(strip $(OOO_JUNIT_JAR))) # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell +# DISABLE_SAL_DBGBOX is the same, for osl/diagnose.h on Windows only .PHONY : $(call gb_JunitTest_get_target,%) $(call gb_JunitTest_get_target,%) : $(call gb_Output_announce,$*,$(true),JUT,2) @@ -111,7 +112,6 @@ define gb_JunitTest_use_jar $(call gb_JavaClassSet_use_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_Jar_get_outdir_target,$(2)) $(call gb_JunitTest_get_target,$(1)) : $(call gb_Jar_get_outdir_target,$(2)) -$(2) :| $(gb_Helper_PHONY) endef |