p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor the handling of static-related build flags

Browse Source 
This is as discussed with @shykes on IRC
Upstream-commit: d7897508516c05e7ffea5b96053ec80c7771d777
Component: engine
This commit is contained in:
Tianon Gravi
2013-10-17 23:38:34 -06:00
committed by Victor Vieux
parent 98fe860f99
commit abf7c9daea
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/hack/make.sh
View File

@ -45,7 +45,7 @@ if [ -n "$(git status --porcelain)" ]; then
fi
# 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'
bundle() {

3
components/engine/hack/make/binary
View File

@ -2,6 +2,5 @@
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"

2
components/engine/hack/make/test
View File

@ -17,7 +17,7 @@ bundle_test() {
set -x
cd $test_dir
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
} 2>&1 | tee $DEST/test.log
}