aboutsummaryrefslogtreecommitdiff
path: root/libgo/Makefile.am
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-11-01 13:50:03 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-11-01 13:50:03 +0000
commit380f39b91b2f596fd4b74b8cae49cfe44cf9bd0b (patch)
tree6d8148e3f8ccfab857a3d34dbd0cb347d9ad114e /libgo/Makefile.am
parentd32e80061847f2ddc60d1c749b229d0802e3395f (diff)
downloadgcc-380f39b91b2f596fd4b74b8cae49cfe44cf9bd0b.zip
gcc-380f39b91b2f596fd4b74b8cae49cfe44cf9bd0b.tar.gz
gcc-380f39b91b2f596fd4b74b8cae49cfe44cf9bd0b.tar.bz2
libgo: minor Makefile improvements
Suggested by Ralph Corderoy. Reviewed-on: https://go-review.googlesource.com/32414 From-SVN: r241741
Diffstat (limited to 'libgo/Makefile.am')
-rw-r--r--libgo/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index d9f84a0..0356de8 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -575,8 +575,8 @@ s-runtime_sysinfo: $(srcdir)/mkrsysinfo.sh gen-sysinfo.go
runtime.inc: s-runtime-inc; @true
s-runtime-inc: runtime.lo Makefile
rm -f runtime.inc.tmp2
- grep -v "#define _" runtime.inc.tmp | grep -v "#define c0 " | grep -v "#define c1 " > runtime.inc.tmp2
- for pattern in '_G[a-z]' '_P[a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
+ grep -v "#define _" runtime.inc.tmp | grep -v "#define c[01] " > runtime.inc.tmp2
+ for pattern in '_[GP][a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
done
$(SHELL) $(srcdir)/mvifdiff.sh runtime.inc.tmp2 runtime.inc
@@ -591,7 +591,7 @@ s-zstdpkglist: Makefile
echo 'package main' > zstdpkglist.go.tmp
echo "" >> zstdpkglist.go.tmp
echo 'var stdpkg = map[string]bool{' >> zstdpkglist.go.tmp
- echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's/\.lo /\": true,\n/g' | sed 's/\.lo/\": true,/' | grep -v _c | sed 's/^/\t\"/' | sort | uniq >> zstdpkglist.go.tmp
+ echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's/\.lo /\": true,\n/g' | grep -v _c | sed 's/\.lo/\": true,/' | sed 's/^/\t\"/' | sort -u >> zstdpkglist.go.tmp
echo '}' >> zstdpkglist.go.tmp
$(SHELL) $(srcdir)/mvifdiff.sh zstdpkglist.go.tmp zstdpkglist.go
$(STAMP) $@