diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-08-15 17:41:25 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-08-15 21:29:14 +0200 |
commit | a455126868f466b8f0e6b3a354dbe88770258913 (patch) | |
tree | d10d7fb68527c8541787f13a217596897f0e6acd /solenv/gbuild/JavaClassSet.mk | |
parent | 49357140beef3b2b3d0b22fa4eea8bf9add73eda (diff) |
gbuild: refactor external jar handling:
Using a system jar should really put the system jar onto the manifest
class-path, but that is currently difficult because externals are used
by JavaClassSet and not Jar; fortunately it seems nobody uses
gb_JavaClassSet_use_external directly so move the implementation to
gb_Jar_use_external.
Change-Id: Ieac480b3dec0ad39d2404b0a64b641eaf73c1e4a
Diffstat (limited to 'solenv/gbuild/JavaClassSet.mk')
-rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 719833108f42..11b67cdf2353 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -172,13 +172,9 @@ $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_C endef -# this forwards to functions that must be defined in RepositoryExternal.mk. -# $(eval $(call gb_LinkTarget_use_external,library,external)) define gb_JavaClassSet_use_external -$(if $(value gb_JavaClassSet__use_$(2)),\ - $(call gb_JavaClassSet__use_$(2),$(1)),\ - $(error gb_JavaClassSet_use_external: unknown external: $(2))) - +$$(call gb_Output_error,\ + gb_JavaClassSet_use_external: use gb_Jar_use_external instead.) endef define gb_JavaClassSet_use_externals |