Merge pull request #313 from wangling12/patch-1

Add mutiarch support
This commit is contained in:
chxuan 2020-11-06 22:53:18 +08:00 committed by GitHub
commit e08ee8c6ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -176,7 +176,7 @@ function compile_vim_on_ubuntu()
--enable-multibyte \
--enable-rubyinterp \
--enable-pythoninterp \
--with-python-config-dir=/usr/lib/python2.7/config-x86_64-linux-gnu \
--with-python-config-dir=/usr/lib/python2.7/config-`dpkg-architecture -qDEB_HOST_MULTIARCH` \
--enable-perlinterp \
--enable-luainterp \
--enable-gui=gtk2 \
@ -199,7 +199,7 @@ function compile_vim_on_debian()
--enable-multibyte \
--enable-rubyinterp \
--enable-pythoninterp \
--with-python-config-dir=/usr/lib/python2.7/config-x86_64-linux-gnu \
--with-python-config-dir=/usr/lib/python2.7/config-`dpkg-architecture -qDEB_HOST_MULTIARCH` \
--enable-perlinterp \
--enable-luainterp \
--enable-gui=gtk2 \
@ -427,10 +427,24 @@ function install_ycm()
read -p "Please choose to compile ycm with python2 or python3, if there is a problem with the current selection, please choose another one. [2/3] " version
if [[ $version == "2" ]]; then
echo "Compile ycm with python2."
python2.7 ./install.py --clang-completer
{
python2.7 ./install.py --clang-completer
} || {
echo "##########################################"
echo "Build error, trying rebuild without Clang."
echo "##########################################"
python2.7 ./install.py
}
else
echo "Compile ycm with python3."
python3 ./install.py --clang-completer
{
python3 ./install.py --clang-completer
} || {
echo "##########################################"
echo "Build error, trying rebuild without Clang."
echo "##########################################"
python3 ./install.py
}
fi
}