Removing auto/modules directory before commiting the new module
configuration infrastructure.
This commit is contained in:
@@ -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"
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user