Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
use mingw32 on jk1
  • Loading branch information
jK committed Dec 24, 2013
1 parent 9dea8c4 commit aaa6454
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion buildbot/mingwlibs_boost.sh
Expand Up @@ -23,6 +23,16 @@ BOOST_CONF=${BOOST_BUILD_DIR}/user-config.jam
MINGW_GPP=/usr/bin/i686-w64-mingw32-g++
GCC_VERSION=$(${MINGW_GPP} -dumpversion)

set +e
IS_GENTOO=$(which emerge)
set -e

if [ -n "$IS_GENTOO" ]; then
# jk1 buildslave's mingw64 install is broken
MINGW_GPP=/usr/bin/i686-mingw32-g++
GCC_VERSION=$(${MINGW_GPP} -dumpversion)
fi

BOOST_LIBS_ARG=""
for LIB in $BOOST_LIBS
do
Expand Down Expand Up @@ -70,7 +80,7 @@ set -e
if [ -n "$EMERGE" ] && [ -x "$EMERGE" ]; then
$EMERGE boost --fetchonly &>/dev/null
source /etc/portage/make.conf
BOOST_FILE=$(find ${DISTDIR} -iname "boost_*.tar.*")
BOOST_FILE=$(find ${DISTDIR} -iname "boost_*.tar.*" -print -quit)
else
wget -P /tmp -N --no-verbose ${BOOST_DL}
BOOST_FILE="/tmp/${BOOST_FILE}"
Expand Down

0 comments on commit aaa6454

Please sign in to comment.