vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made changes to the install.sh to recognize .dll.a files on CYGWIN

Browse Source 
allowing it to discover PYTHON_INCLUDE_DIR and PYTHON_LIBRARY

Also changed wrap_python.hpp to only check for defined(__CYGWIN__)
on 32-bit systems. Previously this check was OR'd with the check
for defined(__WIN32__) causing the system to erroneously update the
SIZEOF_LONG value and subsequently resulting in "make ycm_core"
failing with "LONG_BIT definition appears wrong for platform" on
CYGWIN-64 systems.
This commit is contained in:
Abhinav Krishnamoorthy 2014-02-15 10:59:09 -05:00
parent 18be5c254a
commit a04b77b5a0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpp/BoostParts/boost/python/detail/wrap_python.hpp
View File

@ -82,7 +82,9 @@
// Some things we need in order to get Python.h to work with compilers other // Some things we need in order to get Python.h to work with compilers other
// than MSVC on Win32 // than MSVC on Win32
// //
#if defined(_WIN32) || defined(__CYGWIN__) // only performing the check for defined(__CYGWIN__) on 32-bit systems
// ensuring that SIZEOF_LONG is only altered on 32-bit CYGWIN systems
#if defined(_WIN32)
# if defined(__GNUC__) && defined(__CYGWIN__) # if defined(__GNUC__) && defined(__CYGWIN__)
# define SIZEOF_LONG 4 # define SIZEOF_LONG 4

3
install.sh
View File

@ -41,6 +41,9 @@ function python_finder {
lib_python="${python_prefix}/lib/lib${which_python}" lib_python="${python_prefix}/lib/lib${which_python}"
if [ -f "${lib_python}.a" ]; then if [ -f "${lib_python}.a" ]; then
python_library+="${lib_python}.a" python_library+="${lib_python}.a"
elif [ -f "${lib_python}.dll.a" ]; then
## added a check for .dll.a files for CYGWIN
python_library+="${lib_python}.dll.a"
else else
python_library+="${lib_python}.dylib" python_library+="${lib_python}.dylib"
fi fi