technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Go: adding main configure CFLAGS and LDFLAGS to module build flags.

Browse Source 
This makes ASAN buildbot workers to work out-of-the-box.
This commit is contained in:
Max Romanov
2020-01-28 19:20:46 +03:00
parent 4eb2d3086b
commit 4024b18bcc
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
auto/modules/go
View File

@@ -85,6 +85,14 @@ if grep ^$NXT_GO: $NXT_MAKEFILE 2>&1 > /dev/null; then
exit 1; exit 1;
fi fi
NXT_GO_LDFLAGS=
for o in ${CFLAGS} ${NXT_CC_OPT}; do
case "$o" in
-fsanitize* | -L* | -l*) NXT_GO_LDFLAGS="${NXT_GO_LDFLAGS} $o" ;;
esac
done
cat << END >> $NXT_MAKEFILE cat << END >> $NXT_MAKEFILE
.PHONY: ${NXT_GO} .PHONY: ${NXT_GO}
@@ -116,8 +124,9 @@ ${NXT_GO}-install-env: \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/env.go \
install -d \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG} install -d \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}
$echo "package unit" > \$@ $echo "package unit" > \$@
$echo "/*" >> \$@ $echo "/*" >> \$@
$echo "#cgo CFLAGS: ${CFLAGS} ${NXT_CC_OPT}" >> \$@
$echo "#cgo CPPFLAGS: -I${PWD}/src -I${PWD}/${NXT_BUILD_DIR}" >> \$@ $echo "#cgo CPPFLAGS: -I${PWD}/src -I${PWD}/${NXT_BUILD_DIR}" >> \$@
$echo "#cgo LDFLAGS: -L${PWD}/${NXT_BUILD_DIR}" >> \$@ $echo "#cgo LDFLAGS: -L${PWD}/${NXT_BUILD_DIR} ${NXT_GO_LDFLAGS} ${NXT_LD_OPT}" >> \$@
$echo "*/" >> \$@ $echo "*/" >> \$@
$echo 'import "C"' >> \$@ $echo 'import "C"' >> \$@