From 09a94fec43cb634100750d4e816c5493b8a07cb9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Dec 2003 17:25:54 +0000 Subject: [PATCH] For MinGW prefer using the import library of libpython*.* if available. [SVN r21412] --- v1/python.jam | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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) ; }