Merge pull request #16149 from LK4D4/remove_link_libs

Remove -lpthread and -ldl from ldflags
This commit is contained in:
Jess Frazelle
2015-09-09 10:13:36 -07:00
4 changed files with 5 additions and 8 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ go build --compiler=gccgo \
--gccgoflags "
-g
-Wl,--no-export-dynamic
$EXTLDFLAGS_STATIC_DOCKER
$EXTLDFLAGS_STATIC
-lnetgo
" \
./dockerinit
+1 -1
View File
@@ -13,7 +13,7 @@ fi
(
export IAMSTATIC="false"
export EXTLDFLAGS_STATIC_DOCKER=''
export EXTLDFLAGS_STATIC=''
export LDFLAGS_STATIC_DOCKER=''
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
+2 -2
View File
@@ -8,14 +8,14 @@ BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
source "${MAKEDIR}/.go-autogen"
if [[ "${BUILDFLAGS[@]}" =~ 'netgo ' ]]; then
EXTLDFLAGS_STATIC_DOCKER+=' -lnetgo'
EXTLDFLAGS_STATIC+=' -lnetgo'
fi
go build -compiler=gccgo \
-o "$DEST/$BINARY_FULLNAME" \
"${BUILDFLAGS[@]}" \
-gccgoflags "
-g
$EXTLDFLAGS_STATIC_DOCKER
$EXTLDFLAGS_STATIC
-Wl,--no-export-dynamic
-ldl
" \