This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin] Only regenerate tlsoffsets{64}.h if cygtls.h can be compiled
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: cygwin-cvs at sourceware dot org
- Date: 6 Jun 2016 09:53:41 -0000
- Subject: [newlib-cygwin] Only regenerate tlsoffsets{64}.h if cygtls.h can be compiled
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7abe634731294a7843e6889dfd23687388f0882b
commit 7abe634731294a7843e6889dfd23687388f0882b
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Mon Jun 6 11:44:54 2016 +0200
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 <corinna@vinschen.de>
Diff:
---
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 43919bd..e42dd94 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 $@ ] || \