Remove -lpthread and -ldl from ldflags

There is no need in those flags now when we use amalgamated sqlite3 from
mattn/go-sqlite3.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2015-09-08 11:29:43 -07:00
parent a8d6b033e1
commit 8845eb4345
4 changed files with 5 additions and 8 deletions

View File

@ -150,12 +150,9 @@ BUILDFLAGS=( $BUILDFLAGS "${ORIG_BUILDFLAGS[@]}" )
: ${TIMEOUT:=60m} : ${TIMEOUT:=60m}
TESTFLAGS+=" -test.timeout=${TIMEOUT}" TESTFLAGS+=" -test.timeout=${TIMEOUT}"
# A few more flags that are specific just to building a completely-static binary (see hack/make/binary)
# PLEASE do not use these anywhere else.
EXTLDFLAGS_STATIC_DOCKER="$EXTLDFLAGS_STATIC -lpthread -ldl"
LDFLAGS_STATIC_DOCKER=" LDFLAGS_STATIC_DOCKER="
$LDFLAGS_STATIC $LDFLAGS_STATIC
-extldflags \"$EXTLDFLAGS_STATIC_DOCKER\" -extldflags \"$EXTLDFLAGS_STATIC\"
" "
if [ "$(uname -s)" = 'FreeBSD' ]; then if [ "$(uname -s)" = 'FreeBSD' ]; then

View File

@ -11,7 +11,7 @@ go build --compiler=gccgo \
--gccgoflags " --gccgoflags "
-g -g
-Wl,--no-export-dynamic -Wl,--no-export-dynamic
$EXTLDFLAGS_STATIC_DOCKER $EXTLDFLAGS_STATIC
-lnetgo -lnetgo
" \ " \
./dockerinit ./dockerinit

View File

@ -13,7 +13,7 @@ fi
( (
export IAMSTATIC="false" export IAMSTATIC="false"
export EXTLDFLAGS_STATIC_DOCKER='' export EXTLDFLAGS_STATIC=''
export LDFLAGS_STATIC_DOCKER='' export LDFLAGS_STATIC_DOCKER=''
export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here

View File

@ -8,14 +8,14 @@ BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
source "${MAKEDIR}/.go-autogen" source "${MAKEDIR}/.go-autogen"
if [[ "${BUILDFLAGS[@]}" =~ 'netgo ' ]]; then if [[ "${BUILDFLAGS[@]}" =~ 'netgo ' ]]; then
EXTLDFLAGS_STATIC_DOCKER+=' -lnetgo' EXTLDFLAGS_STATIC+=' -lnetgo'
fi fi
go build -compiler=gccgo \ go build -compiler=gccgo \
-o "$DEST/$BINARY_FULLNAME" \ -o "$DEST/$BINARY_FULLNAME" \
"${BUILDFLAGS[@]}" \ "${BUILDFLAGS[@]}" \
-gccgoflags " -gccgoflags "
-g -g
$EXTLDFLAGS_STATIC_DOCKER $EXTLDFLAGS_STATIC
-Wl,--no-export-dynamic -Wl,--no-export-dynamic
-ldl -ldl
" \ " \