[PATCH xserver] hw/xfree86: remove incomplete sdksyms.c on error

Mihail Konev k.mvc at ya.ru
Thu Feb 16 23:01:41 UTC 2017


Previously, if sdksyms.sh was failing, the incorrect sdksyms.c
would stay, breaking subsequent build attempts.

Signed-off-by: Mihail Konev <k.mvc at ya.ru>
---
Needed this on Solaris due to missing awk -> gawk symlink.

 hw/xfree86/Makefile.am | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 85bd0bed0e58..96f88cb72f66 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -137,7 +137,14 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh
 EXTRA_DIST += sdksyms.sh
 
 sdksyms.dep sdksyms.c: sdksyms.sh
-	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
+	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' \
+		$(SHELL) $(srcdir)/sdksyms.sh \
+			$(top_srcdir) \
+			$(CFLAGS) \
+			$(AM_CFLAGS) \
+			$(AM_CPPFLAGS) \
+			&& exit 0 ; \
+		rm sdksyms.dep sdksyms.c 2>/dev/null ; exit 1
 
 SDKSYMS_DEP = sdksyms.dep
 -include $(SDKSYMS_DEP)
-- 
2.9.2



More information about the xorg-devel mailing list