diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-22 12:35:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-22 12:38:24 +0200 |
| commit | 0e35a8c14a6e757e53c6aed4e7e2b5d4dd30d768 (patch) | |
| tree | cac67b417c3e285ef138cf0905f40dd54e4ae16d | |
| parent | 105bb26e53049a317a43c13ebd9f706df760f27f (diff) | |
gbuild: LinkTarget: try to fix gb_LinkTarget_add_auxtarget for make 3.81
Apparently make 3.81 has trouble with the wildcard in there, it never
seems to find the file... implement the test in shell instead, since we
invoke a command on both branches it shouldn't be slower.
Change-Id: I93cc2cf09ae8af1d9379fde314a44ef92a28b434
| -rwxr-xr-x | solenv/gbuild/LinkTarget.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index da0018f768f5..871105ed6a46 100755 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1236,7 +1236,13 @@ endef # are the LinkTargets) and doing an incremental build. define gb_LinkTarget_add_auxtarget $(2) : $(call gb_LinkTarget_get_target,$(1)) - $$(if $$(wildcard $$@),touch -r $$< $$@,rm -f $$<; echo "ERROR: aux-target missing, library deleted, please try again"; false) + if test -e $$@; then \ + touch -r $$< $$@; \ + else \ + rm -f $$<; \ + echo "ERROR: aux-target missing, library deleted, please try running make again"; \ + false; \ + fi $(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS += $(2) |