diff --git a/v1/python.jam b/v1/python.jam index 8e5b141d9..d8035f42e 100644 --- a/v1/python.jam +++ b/v1/python.jam @@ -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 BOOST_DEBUG_PYTHON in $(properties) { - lib = $(PYTHON_DEBUG_DLL) ; + lib = $(PYTHON_DEBUG_IMPORT_LIB) ; + } + lib ?= $(PYTHON_DLL) ; + if BOOST_DEBUG_PYTHON in $(properties) + { + lib ?= $(PYTHON_DEBUG_DLL) ; } properties += $(lib) ; }