summaryrefslogtreecommitdiff
path: root/libgo/merge.sh
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-07-22 18:15:38 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-07-22 18:15:38 +0000
commit22b955cca564a9a3a5b8c9d9dd1e295b7943c128 (patch)
treeabdbd898676e1f853fca2d7e031d105d7ebcf676 /libgo/merge.sh
parent9d04a3af4c6491536badf6bde9707c907e4d196b (diff)
libgo: update to go1.7rc3
Reviewed-on: https://go-review.googlesource.com/25150 From-SVN: r238662
Diffstat (limited to 'libgo/merge.sh')
-rwxr-xr-xlibgo/merge.sh10
1 files changed, 1 insertions, 9 deletions
diff --git a/libgo/merge.sh b/libgo/merge.sh
index 24f63d9df6b..373937cf796 100755
--- a/libgo/merge.sh
+++ b/libgo/merge.sh
@@ -137,15 +137,7 @@ merge_c() {
fi
}
-if test -f VERSION; then
- if ! cmp -s ${NEWDIR}/VERSION VERSION; then
- cp ${NEWDIR}/VERSION .
- fi
-else
- if test -f ${NEWDIR}/VERSION; then
- cp ${NEWDIR}/VERSION .
- fi
-fi
+echo ${rev} > VERSION
(cd ${NEWDIR}/src && find . -name '*.go' -print) | while read f; do
oldfile=${OLDDIR}/src/$f