diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-03-08 09:55:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-03-08 10:01:48 +0100 |
| commit | 294b86e3dbbdb9b136cb17a51687f4e2762711cf (patch) | |
| tree | 510d4355bdc4825d4b7e6ea5a1a102bdbd410fc3 /solenv/gbuild/ComponentTarget.mk | |
| parent | f4926f2310be4870c948df806053f6573259e10f (diff) | |
gbuild: fix mkdir optimization with make 3.81
The problem is that make 3.81 does not match pattern rules whose target
ends with '/' against directories.
(regression from 408822b54724f8170a1296ddd67e50d8291c8ee1,
90491a073c5b5faee782ad5eab63276fda2342e6)
So use a fake file ".dir" in the respective directory, and try not to
spawn unnecessary mkdir processes by checking for existence via realpath.
This is all quite ugly and should be reverted once support for make 3.81
is dropped.
Also, fix a pre-existing problem of pattern rules with multiple targets
that used to work by accident in Package.mk.
Diffstat (limited to 'solenv/gbuild/ComponentTarget.mk')
| -rw-r--r-- | solenv/gbuild/ComponentTarget.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index adec783c7824..9eb0ea55a7d3 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -52,8 +52,9 @@ $(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$ $(call gb_ComponentTarget_get_target,%) : $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xsltproc is missing.)) -$(call gb_ComponentTarget_get_outdir_target,%/) : - mkdir -p $@ +# the .dir is for make 3.81, which ignores trailing / +$(dir $(call gb_ComponentTarget_get_outdir_target,))%/.dir : + mkdir -p $(dir $@) $(call gb_ComponentTarget_get_outdir_target,%) : $(call gb_Deliver_deliver,$<,$@) @@ -63,7 +64,7 @@ $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) $(call gb_ComponentTarget_get_outdir_target,$(1)) : \ $(call gb_ComponentTarget_get_target,$(1)) \ - | $(dir $(call gb_ComponentTarget_get_outdir_target,$(1))) + | $(dir $(call gb_ComponentTarget_get_outdir_target,$(1))).dir $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1)) endef |