Explorar el Código

Merge pull request #23215 from BlackYoup/pkg-config

make.sh: use PKG_CONFIG environment variable if it exists
Sebastiaan van Stijn hace 9 años
padre
commit
726ef47d5c
Se han modificado 1 ficheros con 3 adiciones y 2 borrados
  1. 3 2
      hack/make.sh

+ 3 - 2
hack/make.sh

@@ -26,6 +26,7 @@ set -o pipefail
 export DOCKER_PKG='github.com/docker/docker'
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export MAKEDIR="$SCRIPTDIR/make"
+export PKG_CONFIG=${PKG_CONFIG:-pkg-config}
 
 : ${TEST_REPEAT:=0}
 
@@ -134,9 +135,9 @@ if [ "$DOCKER_EXPERIMENTAL" ]; then
 fi
 
 DOCKER_BUILDTAGS+=" daemon"
-if pkg-config 'libsystemd >= 209' 2> /dev/null ; then
+if ${PKG_CONFIG} 'libsystemd >= 209' 2> /dev/null ; then
 	DOCKER_BUILDTAGS+=" journald"
-elif pkg-config 'libsystemd-journal' 2> /dev/null ; then
+elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null ; then
 	DOCKER_BUILDTAGS+=" journald journald_compat"
 fi