]> sourceware.org Git - newlib-cygwin.git/commitdiff
Only regenerate tlsoffsets{64}.h if cygtls.h can be compiled
authorCorinna Vinschen <corinna@vinschen.de>
Mon, 6 Jun 2016 09:44:54 +0000 (11:44 +0200)
committerCorinna Vinschen <corinna@vinschen.de>
Mon, 6 Jun 2016 09:44:54 +0000 (11:44 +0200)
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>
winsup/cygwin/Makefile.in

index 43919bdbd5a0debe07d6f9c9de9b62e19520da2a..e42dd94415a5e7b1e91ffd4184ae8281abc5e4bf 100644 (file)
@@ -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 $@ ] || \
This page took 0.030234 seconds and 5 git commands to generate.