diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-11-22 21:39:40 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-11-22 21:39:40 +0000 |
| commit | 8de8bbbeaf03c78f9fa69d1d49ef01a1749220a7 (patch) | |
| tree | f150f1430fac2b7794e96fe1c41966eab091638c | |
| parent | f745d59bc12fe29631b5d1e2429c7df4b3016dd5 (diff) | |
| parent | c4640c6facdb48f98761188645212d9a9184e366 (diff) | |
Merge branch 'dbus-1.10'
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | tools/ci-build.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 8b55d08a..f5e691a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ install: - ": | sudo tee /etc/apt/sources.list.d/google-chrome.list" - test "$dbus_ci_host" != mingw || sudo dpkg --add-architecture i386 - sudo apt-get -qq -y update + - > + test "$dbus_ci_host" != mingw || sudo apt-get -qq -y install + binutils-mingw-w64-i686 g++-mingw-w64-i686 wine:i386 - sudo apt-get -qq -y build-dep dbus - > sudo apt-get -qq -y install @@ -31,9 +34,6 @@ install: xmlto xsltproc xvfb - - > - test "$dbus_ci_host" != mingw || sudo apt-get -qq -y install - binutils-mingw-w64-i686 g++-mingw-w64-i686 wine:i386 # Ubuntu 14.04's autoconf-archive is too old - > wget diff --git a/tools/ci-build.sh b/tools/ci-build.sh index c73d2bc2..3d732919 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -122,7 +122,7 @@ case "$dbus_ci_buildsys" in case "$dbus_ci_host" in (mingw) set _ "$@" - set "$@" --build="$(config.guess)" + set "$@" --build="$(build-aux/config.guess)" set "$@" --host=i686-w64-mingw32 set "$@" LDFLAGS=-L"${mingw}/lib" set "$@" CPPFLAGS=-I"${mingw}/include" |