mirror of
https://github.com/boostorg/build.git
synced 2026-02-21 15:02:19 +00:00
For MinGW prefer using the import library of libpython*.* if available.
[SVN r21412]
This commit is contained in:
@@ -85,6 +85,8 @@ if $(NT)
|
||||
|
||||
PYTHON_DLL ?= [ GLOB $(PATH) $(Path) : python$(PYTHON_VERSION_NODOT).dll ] ;
|
||||
PYTHON_DEBUG_DLL ?= [ GLOB $(PATH) $(Path) : python$(PYTHON_VERSION_NODOT)_d.dll ] ;
|
||||
PYTHON_IMPORT_LIB ?= [ GLOB $(PYTHON_LIB_PATH) : libpython$(PYTHON_VERSION_NODOT).* ] ;
|
||||
PYTHON_DEBUG_IMPORT_LIB ?= [ GLOB $(PYTHON_LIB_PATH) : libpython$(PYTHON_VERSION_NODOT).* ] ;
|
||||
}
|
||||
else if $(UNIX) && $(OS) = MACOSX
|
||||
{
|
||||
@@ -208,10 +210,15 @@ rule select-python-library ( toolset variant : properties * )
|
||||
}
|
||||
else if [ MATCH .*(mingw).* : $(toolset) ]
|
||||
{
|
||||
local lib = $(PYTHON_DLL) ;
|
||||
local lib = $(PYTHON_IMPORT_LIB) ;
|
||||
if <define>BOOST_DEBUG_PYTHON in $(properties)
|
||||
{
|
||||
lib = $(PYTHON_DEBUG_DLL) ;
|
||||
lib = $(PYTHON_DEBUG_IMPORT_LIB) ;
|
||||
}
|
||||
lib ?= $(PYTHON_DLL) ;
|
||||
if <define>BOOST_DEBUG_PYTHON in $(properties)
|
||||
{
|
||||
lib ?= $(PYTHON_DEBUG_DLL) ;
|
||||
}
|
||||
properties += <library-file>$(lib) ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user