summaryrefslogtreecommitdiffhomepage
path: root/auto/modules
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2017-07-25 20:29:02 +0300
committerIgor Sysoev <igor@sysoev.ru>2017-07-25 20:29:02 +0300
commitd218c5f7b45dfcd73ed67dcf41139a3cc98e32fb (patch)
tree84e86a28a8f512248ca60ac39061968325323f3a /auto/modules
parent057c2526ee34e83fcace2d933f524be6d0f59fea (diff)
downloadunit-d218c5f7b45dfcd73ed67dcf41139a3cc98e32fb.tar.gz
unit-d218c5f7b45dfcd73ed67dcf41139a3cc98e32fb.tar.bz2
Updated Go configure test.
Diffstat (limited to 'auto/modules')
-rw-r--r--auto/modules/go/conf17
1 files changed, 13 insertions, 4 deletions
diff --git a/auto/modules/go/conf b/auto/modules/go/conf
index 4c02fdc9..79651d98 100644
--- a/auto/modules/go/conf
+++ b/auto/modules/go/conf
@@ -3,18 +3,27 @@
# Copyright (C) NGINX, Inc.
+$echo -n "checking for Go ..."
+$echo -n "checking for Go ..." >> $NXT_AUTOCONF_ERR
+
NXT_GO_VERSION="`${NXT_GO} version`"
-GOPATH=`pwd` CGO_CPPFLAGS="-DNXT_CONFIGURE" "${NXT_GO}" build -o build/nxt_go_gen.a --buildmode=c-archive nginext
+if /bin/sh -c "GOPATH=`pwd` CGO_CPPFLAGS=-DNXT_CONFIGURE \
+ \"${NXT_GO}\" build -o build/nxt_go_gen.a --buildmode=c-archive nginext" \
+ >> $NXT_AUTOCONF_ERR 2>&1;
+
+then
+ $echo " found"
+ $echo " + Go version: ${NXT_GO_VERSION}"
-if [ "$?" -ne 0 ]; then
+else
+ $echo
$echo
- $echo $0: error: no go found.
+ $echo $0: error: Go not found.
$echo
exit 1;
fi
-$echo " + go version: ${NXT_GO_VERSION}"
NXT_GO_MODULE_SRCS=" \
src/nxt_go.c \