Merge pull request chxuan#313 from wangling12/patch-1

Add mutiarch support
Qorbanzadeh · Nov 6, 2020 · e08ee8c · e08ee8c
2 parents 50ad92c + 99b0fe7
commit e08ee8c
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/install.sh b/install.sh
@@ -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
 }