From 433f84bffa4744b01da49f4eee28a1f1ddf30793 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 27 Aug 2019 14:25:04 +0000 Subject: [PATCH] libgo: rebuild runtime.inc if mkruntimeinc.sh changes The Makefile was missing a dependency. Also remove runtime.inc.raw in mostlyclean. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/191958 From-SVN: r274956 --- gcc/go/gofrontend/MERGE | 2 +- libgo/Makefile.am | 5 +++-- libgo/Makefile.in | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 4f08f2320d8..18127de31ac 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -58c0fc64d91edc53ef9828b85cf3dc86aeb94e12 +a6ddd0e1208a7d229c10be630c1110b3914038f5 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 88f885b6675..9348af94863 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -612,7 +612,7 @@ s-zdefaultcc: Makefile # compiling runtime) to prune out certain types that should not be # exported back to C. See comments in mkruntimeinc.sh for more details. runtime.inc: s-runtime-inc; @true -s-runtime-inc: runtime.lo Makefile +s-runtime-inc: runtime.lo mkruntimeinc.sh Makefile $(SHELL) $(srcdir)/mkruntimeinc.sh $(SHELL) $(srcdir)/mvifdiff.sh tmp-runtime.inc runtime.inc $(STAMP) $@ @@ -1205,7 +1205,8 @@ MOSTLYCLEANFILES = \ s-libcalls s-libcalls-list s-syscall_arch s-gen-sysinfo s-sysinfo \ s-errno s-epoll \ libgo.head libgo.sum.sep libgo.log.sep libgo.var \ - libcalls-list runtime.inc runtime.inc.tmp2 runtime.inc.tmp3 + libcalls-list \ + runtime.inc runtime.inc.tmp2 runtime.inc.tmp3 runtime.inc.raw mostlyclean-local: find . -name '*.lo' -print | xargs $(LIBTOOL) --mode=clean rm -f diff --git a/libgo/Makefile.in b/libgo/Makefile.in index f53ca3f4b12..153bc95530e 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -1156,7 +1156,8 @@ MOSTLYCLEANFILES = \ s-libcalls s-libcalls-list s-syscall_arch s-gen-sysinfo s-sysinfo \ s-errno s-epoll \ libgo.head libgo.sum.sep libgo.log.sep libgo.var \ - libcalls-list runtime.inc runtime.inc.tmp2 runtime.inc.tmp3 + libcalls-list \ + runtime.inc runtime.inc.tmp2 runtime.inc.tmp3 runtime.inc.raw CLEANFILES = *.go *.c s-* libgo.sum libgo.log runtime.inc MULTISRCTOP = @@ -2728,7 +2729,7 @@ s-zdefaultcc: Makefile # compiling runtime) to prune out certain types that should not be # exported back to C. See comments in mkruntimeinc.sh for more details. runtime.inc: s-runtime-inc; @true -s-runtime-inc: runtime.lo Makefile +s-runtime-inc: runtime.lo mkruntimeinc.sh Makefile $(SHELL) $(srcdir)/mkruntimeinc.sh $(SHELL) $(srcdir)/mvifdiff.sh tmp-runtime.inc runtime.inc $(STAMP) $@ -- 2.30.2