docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor the handling of static-related build flags 

This is as discussed with @shykes on IRC
This commit is contained in:
Tianon Gravi 2013-10-17 23:38:34 -06:00 committed by Victor Vieux
parent fb8d488896
commit d789750851
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/make.sh
View File

@ -45,7 +45,7 @@ if [ -n "$(git status --porcelain)" ]; then
fi fi
# Use these flags when compiling the tests and final binary # Use these flags when compiling the tests and final binary
LDFLAGS='-X main.GITCOMMIT "'$GITCOMMIT'" -X main.VERSION "'$VERSION'" -w -linkmode external -extldflags "-lpthread -static -Wl,--unresolved-symbols=ignore-in-object-files"' LDFLAGS='-X main.GITCOMMIT "'$GITCOMMIT'" -X main.VERSION "'$VERSION'" -w'
BUILDFLAGS='-tags netgo' BUILDFLAGS='-tags netgo'
bundle() { bundle() {

3
hack/make/binary
View File

@ -2,6 +2,5 @@
DEST=$1 DEST=$1
go build -o $DEST/docker-$VERSION -ldflags "$LDFLAGS" $BUILDFLAGS ./docker go build -o $DEST/docker-$VERSION -ldflags "$LDFLAGS -linkmode external -extldflags \"-lpthread -static -Wl,--unresolved-symbols=ignore-in-object-files\"" $BUILDFLAGS ./docker
echo "Created binary: $DEST/docker-$VERSION" echo "Created binary: $DEST/docker-$VERSION"

2
hack/make/test
View File

@ -17,7 +17,7 @@ bundle_test() {
set -x set -x
cd $test_dir cd $test_dir
go test -i go test -i
go test -v -ldflags "$LDFLAGS" $BUILDFLAGS $TESTFLAGS go test -v -ldflags "$LDFLAGS -linkmode external -extldflags \"-lpthread -static -Wl,--unresolved-symbols=ignore-in-object-files\"" $BUILDFLAGS $TESTFLAGS
) done ) done
} 2>&1 | tee $DEST/test.log } 2>&1 | tee $DEST/test.log
} }