diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2017-08-17 21:47:19 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2017-08-17 21:47:19 +0300 |
| commit | 5ef8e0ee8933e914b1847168255b53f07c3727b3 (patch) | |
| tree | f4e4b512d86a8a92eeb48c44e54db510660ea4fe /auto/modules/go | |
| parent | 1ba2f44ad9b95670452f31a0923b8a118a08d867 (diff) | |
| download | unit-5ef8e0ee8933e914b1847168255b53f07c3727b3.tar.gz unit-5ef8e0ee8933e914b1847168255b53f07c3727b3.tar.bz2 | |
Removing auto/modules directory before commiting the new module
configuration infrastructure.
Diffstat (limited to 'auto/modules/go')
| -rw-r--r-- | auto/modules/go/conf | 37 | ||||
| -rw-r--r-- | auto/modules/go/make | 44 |
2 files changed, 0 insertions, 81 deletions
diff --git a/auto/modules/go/conf b/auto/modules/go/conf deleted file mode 100644 index e7c346e1..00000000 --- a/auto/modules/go/conf +++ /dev/null @@ -1,37 +0,0 @@ - -# Copyright (C) Max Romanov -# Copyright (C) NGINX, Inc. - - -$echo -n "checking for Go ..." -$echo "checking for Go ..." >> $NXT_AUTOCONF_ERR - -nxt_go_test="GOPATH=`pwd` CGO_CPPFLAGS=-DNXT_CONFIGURE \ - \"${NXT_GO}\" build -o build/nxt_go_gen.a --buildmode=c-archive nginext" - - -if /bin/sh -c "$nxt_go_test" >> $NXT_AUTOCONF_ERR 2>&1; then - $echo " found" - - NXT_GO_VERSION="`${NXT_GO} version`" - $echo " + Go version: ${NXT_GO_VERSION}" - -else - $echo "----------" >> $NXT_AUTOCONF_ERR - $echo $nxt_go_test >> $NXT_AUTOCONF_ERR - $echo "----------" >> $NXT_AUTOCONF_ERR - $echo - $echo - $echo $0: error: no Go found. - $echo - exit 1; -fi - - -NXT_GO_MODULE_SRCS=" \ - src/nxt_go.c \ -" - - -NXT_MODULES_INIT="$NXT_MODULES_INIT nxt_go_module_init" -NXT_MODULES_SRCS="$NXT_MODULES_SRCS $NXT_GO_MODULE_SRCS" diff --git a/auto/modules/go/make b/auto/modules/go/make deleted file mode 100644 index ebacf0df..00000000 --- a/auto/modules/go/make +++ /dev/null @@ -1,44 +0,0 @@ - -# Copyright (C) Max Romanov -# Copyright (C) NGINX, Inc. - - -$echo >> $NXT_MAKEFILE -$echo >> $NXT_MAKEFILE - - -# The go module object files. - -for nxt_src in $NXT_GO_MODULE_SRCS -do - nxt_obj=`$echo $nxt_src | sed -e "s/\.c$/\.o/"` - cat << END >> $NXT_MAKEFILE - -$NXT_BUILD_DIR/$nxt_obj: $nxt_src - \$(CC) -c \$(CFLAGS) \$(NXT_INCS) \\ - $NXT_LIB_AUX_CFLAGS \\ - -o $NXT_BUILD_DIR/$nxt_obj \\ - $nxt_src -END - -done - -cat << END >> $NXT_MAKEFILE -.PHONY: golang-nginext-install - -NXT_ROOT = \$(shell pwd) - -GOPATH = \$(shell go env GOPATH) -GOOS = \$(shell go env GOOS) -GOARCH = \$(shell go env GOARCH) - -golang-nginext-install: - install -d \$(GOPATH)/src/nginext - install -p ./src/nginext/*.c ./src/nginext/*.h ./src/nginext/*.go \$(GOPATH)/src/nginext/ - CGO_CFLAGS="-I\$(NXT_ROOT)/build -I\$(NXT_ROOT)/src" CGO_LDFLAGS="-L\$(NXT_ROOT)/build" go install -v nginext - -golang-nginext-uninstall: - rm -rf \$(GOPATH)/src/nginext - rm -f \$(GOPATH)/pkg/\$(GOOS)_\$(GOARCH)/nginext.a - -END |