From 7abe634731294a7843e6889dfd23687388f0882b Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 6 Jun 2016 11:44:54 +0200 Subject: [PATCH] Only regenerate tlsoffsets{64}.h if cygtls.h can be compiled The rule to make tlsoffset{64}.h has a flaw. If cygtls.h can't be built for whatever reason, it *still* regenerates tlsoffsets{64}.h, just with size 0. If the bug is not in cygtls.h itself, this behaviour breaks further building, because fixing the problem won't result in regenerating tlsoffset{64}.h. Manual intervention is required. Fix that by removing tlsoffsets{64}.h if gentls_offsets fails. Signed-off-by: Corinna Vinschen --- winsup/cygwin/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 43919bdbd..e42dd9441 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -758,7 +758,7 @@ $(DEF_FILE): gendef $(srcdir)/$(TLSOFFSETS_H) $(DIN_FILE) $(word 1,$^) --cpu=${target_cpu} --output-def=$@ --tlsoffsets=$(word 2,$^) $(wordlist 3,99,$^) $(srcdir)/$(TLSOFFSETS_H): gentls_offsets cygtls.h - $^ $@ $(target_cpu) $(COMPILE.cc) -c + $^ $@ $(target_cpu) $(COMPILE.cc) -c || rm $@ sigfe.s: $(DEF_FILE) @[ -s $@ ] || \