diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-29 13:29:47 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-29 17:32:51 +0100 |
| commit | 14d45795b2a555ef8121d3f1c406fe0d59cfdba5 (patch) | |
| tree | 3c1de7dd05e3e955a7fe8346d1fa8efd6c7d4d14 /solenv | |
| parent | 0f075129c95f7aee782bf08b2edbe7c71db1c7b2 (diff) | |
Setting CLASSPATH/XCLASSPATH appears to be a leftover
...from the old dmake and/or Hamburg-specific set up.
Change-Id: I441ce66dd91d353196cd9d1a9853720195a6fcdc
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Jar.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 4527fcfc0545..5d53511d6ca4 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -96,7 +96,6 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS := $(call gb_Jar_get_target,$(1)) : PACKAGEDIRS := $(call gb_Jar_get_target,$(1)) : PACKAGEFILES := $(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1))) -$(call gb_JavaClassSet_add_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH)) $(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1)))) $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1)) $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1)) diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 8dbc1bfe0090..fbe87fd27c38 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -67,7 +67,7 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : T_CP := $(if $(value XCLASSPATH),$$(value XCLASSPATH)$$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib +$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(eval $(call gb_JunitTest_JunitTest_platform,$(1))) |