@@ -84,24 +84,10 @@ if [ ! "$GOPATH" ]; then

 	exit 1

 fi

-# Adds $1_$2 to DOCKER_BUILDTAGS unless it already

-# contains a word starting from $1_

-add_buildtag() {

-	[[ " $DOCKER_BUILDTAGS" == *" $1_"* ]] || DOCKER_BUILDTAGS+=" $1_$2"

-}

-

 if ${PKG_CONFIG} 'libsystemd' 2> /dev/null; then

 	DOCKER_BUILDTAGS+=" journald"

 fi

-# test whether "libdevmapper.h" is new enough to support deferred remove

-# functionality. We favour libdm_dlsym_deferred_remove over

-# libdm_no_deferred_remove in dynamic cases because the binary could be shipped

-# with a newer libdevmapper than the one it was built with.

-if command -v gcc &> /dev/null && ! (echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(${PKG_CONFIG} --libs devmapper 2> /dev/null) &> /dev/null); then

-	add_buildtag libdm dlsym_deferred_remove

-fi

-

 # Use these flags when compiling the tests and final binary

 if [ -z "$DOCKER_DEBUG" ]; then

@@ -12,7 +12,7 @@

 #

 set -eux -o pipefail

-BUILDFLAGS=(-tags 'netgo libdm_no_deferred_remove journald')

+BUILDFLAGS=(-tags 'netgo journald')

 TESTFLAGS+=" -test.timeout=${TIMEOUT:-5m}"

 TESTDIRS="${TESTDIRS:-./...}"

 exclude_paths='/vendor/|/integration'