@@ -203,21 +203,23 @@ if [ -n "$HOST" ]; then
203203 BUILDDIR=$BUILDDIR -$HOST
204204
205205 if [ -n " $WITH_PYTHON " ]; then
206- PYTHON_VER=" 3.9"
207206 # The python3-config script requires executing with bash. It outputs
208207 # an extra trailing space, which the extra 'echo' layer gets rid of.
209208 EXT_SUFFIX=" $( echo $( bash $PREFIX /python/bin/python3-config --extension-suffix) ) "
209+ PYTHON_RELATIVE_PATH=" $( cd " $PREFIX " && echo python/lib/python* /site-packages) "
210+ PYTHON_INCLUDE_DIR=" $( echo $PREFIX /python/include/python* ) "
211+ PYTHON_LIB=" $( echo $PREFIX /python/lib/libpython* .dll.a) "
210212 CMAKEFLAGS=" $CMAKEFLAGS -DLLDB_ENABLE_PYTHON=ON"
211213 CMAKEFLAGS=" $CMAKEFLAGS -DPYTHON_HOME=$PREFIX /python"
212214 CMAKEFLAGS=" $CMAKEFLAGS -DLLDB_PYTHON_HOME=../python"
213215 # Relative to the lldb install root
214- CMAKEFLAGS=" $CMAKEFLAGS -DLLDB_PYTHON_RELATIVE_PATH=python/lib/python $PYTHON_VER /site-packages "
216+ CMAKEFLAGS=" $CMAKEFLAGS -DLLDB_PYTHON_RELATIVE_PATH=$PYTHON_RELATIVE_PATH "
215217 # Relative to LLDB_PYTHON_HOME
216218 CMAKEFLAGS=" $CMAKEFLAGS -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python3.exe"
217219 CMAKEFLAGS=" $CMAKEFLAGS -DLLDB_PYTHON_EXT_SUFFIX=$EXT_SUFFIX "
218220
219- CMAKEFLAGS=" $CMAKEFLAGS -DPython3_INCLUDE_DIRS=$PREFIX /python/include/python $PYTHON_VER "
220- CMAKEFLAGS=" $CMAKEFLAGS -DPython3_LIBRARIES=$PREFIX /python/lib/libpython $PYTHON_VER .dll.a "
221+ CMAKEFLAGS=" $CMAKEFLAGS -DPython3_INCLUDE_DIRS=$PYTHON_INCLUDE_DIR "
222+ CMAKEFLAGS=" $CMAKEFLAGS -DPython3_LIBRARIES=$PYTHON_LIB "
221223 fi
222224elif [ -n " $STAGE2 " ]; then
223225 # Build using an earlier built and installed clang in the target directory
0 commit comments