mirror of
https://github.com/neovim/neovim.git
synced 2025-12-05 14:13:10 +00:00
Merge pull request #4185 from justinmk/ci_mingw
CI/travis: get MinGW from our mirror
This commit is contained in:
@@ -19,6 +19,10 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the
|
|||||||
echo "\$LLVM_SYMBOLIZER: '${LLVM_SYMBOLIZER}' is not executable."
|
echo "\$LLVM_SYMBOLIZER: '${LLVM_SYMBOLIZER}' is not executable."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
if [ "${BUILD_32BIT}" = ON ] && [ "${BUILD_MINGW}" = ON ]; then
|
||||||
|
>&2 echo "32-bit MinGW builds not supported."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
|
if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
|
||||||
# Adds user to a dummy group.
|
# Adds user to a dummy group.
|
||||||
|
|||||||
@@ -1,10 +1,5 @@
|
|||||||
build_deps() {
|
build_deps() {
|
||||||
if [[ "${BUILD_32BIT}" == ON ]]; then
|
if [[ "${BUILD_32BIT}" == ON ]]; then
|
||||||
if [[ "${BUILD_MINGW}" == ON ]]; then
|
|
||||||
>&2 echo "32-bit MinGW builds not supported."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
|
DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
|
||||||
fi
|
fi
|
||||||
if [[ "${BUILD_MINGW}" == ON ]]; then
|
if [[ "${BUILD_MINGW}" == ON ]]; then
|
||||||
@@ -42,11 +37,6 @@ build_nvim() {
|
|||||||
CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON"
|
CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON"
|
||||||
fi
|
fi
|
||||||
if [[ "${BUILD_32BIT}" == ON ]]; then
|
if [[ "${BUILD_32BIT}" == ON ]]; then
|
||||||
if [[ "${BUILD_MINGW}" == ON ]]; then
|
|
||||||
>&2 echo "32-bit MinGW builds not supported."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
|
CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
|
||||||
fi
|
fi
|
||||||
if [[ "${BUILD_MINGW}" == ON ]]; then
|
if [[ "${BUILD_MINGW}" == ON ]]; then
|
||||||
|
|||||||
@@ -14,7 +14,9 @@ elif [[ "${BUILD_MINGW}" == ON ]]; then
|
|||||||
# binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64-dev mingw-w64-tools
|
# binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64-dev mingw-w64-tools
|
||||||
|
|
||||||
echo "Downloading MinGW..."
|
echo "Downloading MinGW..."
|
||||||
curl -sSL "http://downloads.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/rubenvb/gcc-4.8-release/i686-w64-mingw32-gcc-4.8.0-linux64_rubenvb.tar.xz" | tar xJf - -C "${HOME}/.local"
|
curl -sSL "https://github.com/neovim/deps/raw/master/opt/i686-w64-mingw32-gcc-4.8.0-linux64_rubenvb.tar.xz" \
|
||||||
|
| tar xJf - -C "${HOME}/.local"
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Set CC to default to avoid compilation problems
|
# Set CC to default to avoid compilation problems
|
||||||
|
|||||||
Reference in New Issue
Block a user