diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2016-06-06 11:44:54 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-06-06 11:44:54 +0200 |
| commit | 7abe634731294a7843e6889dfd23687388f0882b (patch) | |
| tree | 59cdfd47e8b946dc200dd861f1843061c65594a0 | |
| parent | f4edc7fd6d2cf696bfa083c20e5fdd632a47d71f (diff) | |
| download | cygnal-7abe634731294a7843e6889dfd23687388f0882b.tar.gz cygnal-7abe634731294a7843e6889dfd23687388f0882b.tar.bz2 cygnal-7abe634731294a7843e6889dfd23687388f0882b.zip | |
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>
| -rw-r--r-- | winsup/cygwin/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
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 $@ ] || \ |