wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup CGO_*FLAGS 

Use CGO_CPPFLAGS, remove non-ld options from CGO_LDFLAGS.
This commit is contained in:
Julien Blache 2018-05-02 12:31:11 -07:00
parent 27fab38b87
commit 029373835c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bindings/go/fdb-go-install.sh
View File

@ -272,8 +272,9 @@ else
# Do not install if only downloading # Do not install if only downloading
: :
elif [[ "${status}" -eq 0 ]] ; then elif [[ "${status}" -eq 0 ]] ; then
cgo_cflags="-g -O2 -I${linkpath}/bindings/c" cgo_cppflags="-I${linkpath}/bindings/c"
cgo_ldflags="-g -O2 -L${FDBLIBDIR}" cgo_cflags="-g -O2"
cgo_ldflags="-L${FDBLIBDIR}"
fdb_go_path="${REMOTE}/${FDBREPO}/bindings/go/src" fdb_go_path="${REMOTE}/${FDBREPO}/bindings/go/src"
if [[ ! -e "${FDBLIBDIR}/${libfdbc}" ]] ; then if [[ ! -e "${FDBLIBDIR}/${libfdbc}" ]] ; then
@ -282,7 +283,7 @@ else
echo "WARNING: The FoundationDB C library was not found within ${FDBLIBDIR}." echo "WARNING: The FoundationDB C library was not found within ${FDBLIBDIR}."
echo "Your installation may be incomplete." echo "Your installation may be incomplete."
echo echo
elif ! CGO_CFLAGS="${cgo_cflags}" CGO_LDFLAGS="${cgo_ldflags}" go install "${fdb_go_path}/fdb" "${fdb_go_path}/fdb/tuple" "${fdb_go_path}/fdb/subspace" "${fdb_go_path}/fdb/directory" ; then elif ! CGO_CPPFLAGS="${cgo_cppflags}" CGO_CFLAGS="${cgo_cflags}" CGO_LDFLAGS="${cgo_ldflags}" go install "${fdb_go_path}/fdb" "${fdb_go_path}/fdb/tuple" "${fdb_go_path}/fdb/subspace" "${fdb_go_path}/fdb/directory" ; then
let status="${status} + 1" let status="${status} + 1"
echo "Could not build FoundationDB go libraries." echo "Could not build FoundationDB go libraries."
fi fi
@ -295,6 +296,7 @@ else
echo "The FoundationDB go bindings were successfully installed." echo "The FoundationDB go bindings were successfully installed."
echo "To build packages which use the go bindings, you will need to" echo "To build packages which use the go bindings, you will need to"
echo "set the following environment variables:" echo "set the following environment variables:"
echo " CGO_CPPFLAGS=\"${cgo_cppflags}\""
echo " CGO_CFLAGS=\"${cgo_cflags}\"" echo " CGO_CFLAGS=\"${cgo_cflags}\""
echo " CGO_LDFLAGS=\"${cgo_ldflags}\"" echo " CGO_LDFLAGS=\"${cgo_ldflags}\""
fi fi