From 85f6155b9e6e9d2fd88e81b9f67cff89bb6cf770 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 14 May 2015 15:24:15 -0700 Subject: [PATCH] unix: emit +build comments in generator scripts Change-Id: I8ed64dcb1c1a2119ce6f15fa1be55fbe0b0c637e Reviewed-on: https://go-review.googlesource.com/10087 Reviewed-by: Rob Pike Reviewed-by: Minux Ma Reviewed-by: Dave Cheney --- unix/mkall.sh | 2 +- unix/mkerrors.sh | 7 +++++++ unix/mksyscall.pl | 7 +++++++ unix/mksyscall_solaris.pl | 7 +++++++ unix/mksysctl_openbsd.pl | 7 +++++++ unix/mksysnum_darwin.pl | 7 +++++++ unix/mksysnum_dragonfly.pl | 7 +++++++ unix/mksysnum_freebsd.pl | 7 +++++++ unix/mksysnum_linux.pl | 7 +++++++ unix/mksysnum_netbsd.pl | 7 +++++++ unix/mksysnum_openbsd.pl | 7 +++++++ 11 files changed, 71 insertions(+), 1 deletion(-) diff --git a/unix/mkall.sh b/unix/mkall.sh index d00ab2ff..da57b811 100755 --- a/unix/mkall.sh +++ b/unix/mkall.sh @@ -257,5 +257,5 @@ esac esac if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi - if [ -n "$mktypes" ]; then echo "$mktypes types_$GOOS.go |gofmt >ztypes_$GOOSARCH.go"; fi + if [ -n "$mktypes" ]; then echo "$mktypes types_$GOOS.go | sed -e '/^package /i\/\/ +build $GOARCH,$GOOS\n' | gofmt >ztypes_$GOOSARCH.go"; fi ) | $run diff --git a/unix/mkerrors.sh b/unix/mkerrors.sh index 48c62d5c..8e967035 100755 --- a/unix/mkerrors.sh +++ b/unix/mkerrors.sh @@ -11,6 +11,11 @@ unset LANG export LC_ALL=C export LC_CTYPE=C +if test -z "$GOARCH" -o -z "$GOOS"; then + echo 1>&2 "GOARCH or GOOS not defined in environment" + exit 1 +fi + CC=${CC:-gcc} uname=$(uname) @@ -347,6 +352,8 @@ echo '#include ' | $CC -x c - -E -dM $ccflags | echo '// mkerrors.sh' "$@" echo '// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT' echo +echo "// +build ${GOARCH},${GOOS}" +echo go tool cgo -godefs -- "$@" _const.go >_error.out cat _error.out | grep -vf _error.grep | grep -vf _signal.grep echo diff --git a/unix/mksyscall.pl b/unix/mksyscall.pl index ec0103ca..b1e7766d 100755 --- a/unix/mksyscall.pl +++ b/unix/mksyscall.pl @@ -63,6 +63,11 @@ if($ARGV[0] =~ /^-/) { exit 1; } +if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") { + print STDERR "GOARCH or GOOS not defined in environment\n"; + exit 1; +} + sub parseparamlist($) { my ($list) = @_; $list =~ s/^\s*//; @@ -302,6 +307,8 @@ print <