Don't force rebuild if mksysinfo.sh does not change sysinfo.go.

From-SVN: r169342

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index af67803034d212d0ecc91579b405aa8c8728b673..dd17fffc9ab27e3e760ab1198d3eef8f066f2343 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -2464,8 +2464,12 @@ testing/script/check: $(CHECK_DEPS)
        $(CHECK)
 .PHONY: testing/script/check
 
-sysinfo.go: $(srcdir)/mksysinfo.sh config.h
+sysinfo.go: s-sysinfo; @true
+s-sysinfo: $(srcdir)/mksysinfo.sh config.h
        CC="$(CC)" $(SHELL) $(srcdir)/mksysinfo.sh
+       $(SHELL) $(srcdir)/../move-if-change tmp-sysinfo.go sysinfo.go
+       $(STAMP) $@
+
 syscalls/libsyscall.a: $(go_syscall_files) $(go_syscall_c_files) sync.gox
        rm -f syscall.gox syscalls/libsyscall.a
        test -d syscalls || $(MKDIR_P) syscalls

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index af123adf7a963046685ebb6a42f362bb5979d897..238d0d3553bfb3ebfca81d9accf47c06ccd9da1c 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -4863,8 +4863,12 @@ testing/script/check: $(CHECK_DEPS)
        $(CHECK)
 .PHONY: testing/script/check
 
-sysinfo.go: $(srcdir)/mksysinfo.sh config.h
+sysinfo.go: s-sysinfo; @true
+s-sysinfo: $(srcdir)/mksysinfo.sh config.h
        CC="$(CC)" $(SHELL) $(srcdir)/mksysinfo.sh
+       $(SHELL) $(srcdir)/../move-if-change tmp-sysinfo.go sysinfo.go
+       $(STAMP) $@
+
 syscalls/libsyscall.a: $(go_syscall_files) $(go_syscall_c_files) sync.gox
        rm -f syscall.gox syscalls/libsyscall.a
        test -d syscalls || $(MKDIR_P) syscalls

diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index 20eae7904c9e43bec558006e7f790b87e3efe7d8..321b43245841ef1433fcffbd43c9844c4a2bf084 100755 (executable)
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -21,8 +21,6 @@ OUT=tmp-sysinfo.go
 
 set -e
 
-rm -f sysinfo.go
-
 rm -f sysinfo.c
 cat > sysinfo.c <<EOF
 #include "config.h"
@@ -388,5 +386,4 @@ echo $msghdr | \
       -e 's/msg_flags/Flags/' \
     >> ${OUT}
 
-mv -f ${OUT} sysinfo.go
 exit $?