zefie/llvm-mingw
1
0 Fork 0
Code Activity

build-llvm: Avoid hardcoding the python version number in this script

Browse Source 
This eases updating the build to a newer version of python.
This commit is contained in:
Martin Storsjö committed 2022-06-19 23:10:14 +03:00
1 parent 9c002a9e1b
commit 577e25b821
1 file changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files
build-llvm.sh
+6 -4
View File
@@ -203,21 +203,23 @@ if [ -n "$HOST" ]; then
BUILDDIR=$BUILDDIR-$HOST BUILDDIR=$BUILDDIR-$HOST
if [ -n "$WITH_PYTHON" ]; then if [ -n "$WITH_PYTHON" ]; then
PYTHON_VER="3.9"
# The python3-config script requires executing with bash. It outputs # The python3-config script requires executing with bash. It outputs
# an extra trailing space, which the extra 'echo' layer gets rid of. # an extra trailing space, which the extra 'echo' layer gets rid of.
EXT_SUFFIX="$(echo $(bash $PREFIX/python/bin/python3-config --extension-suffix))" EXT_SUFFIX="$(echo $(bash $PREFIX/python/bin/python3-config --extension-suffix))"
PYTHON_RELATIVE_PATH="$(cd "$PREFIX" && echo python/lib/python*/site-packages)"
PYTHON_INCLUDE_DIR="$(echo $PREFIX/python/include/python*)"
PYTHON_LIB="$(echo $PREFIX/python/lib/libpython*.dll.a)"
CMAKEFLAGS="$CMAKEFLAGS -DLLDB_ENABLE_PYTHON=ON" CMAKEFLAGS="$CMAKEFLAGS -DLLDB_ENABLE_PYTHON=ON"
CMAKEFLAGS="$CMAKEFLAGS -DPYTHON_HOME=$PREFIX/python" CMAKEFLAGS="$CMAKEFLAGS -DPYTHON_HOME=$PREFIX/python"
CMAKEFLAGS="$CMAKEFLAGS -DLLDB_PYTHON_HOME=../python" CMAKEFLAGS="$CMAKEFLAGS -DLLDB_PYTHON_HOME=../python"
# Relative to the lldb install root # Relative to the lldb install root
CMAKEFLAGS="$CMAKEFLAGS -DLLDB_PYTHON_RELATIVE_PATH=python/lib/python$PYTHON_VER/site-packages" CMAKEFLAGS="$CMAKEFLAGS -DLLDB_PYTHON_RELATIVE_PATH=$PYTHON_RELATIVE_PATH"
# Relative to LLDB_PYTHON_HOME # Relative to LLDB_PYTHON_HOME
CMAKEFLAGS="$CMAKEFLAGS -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python3.exe" CMAKEFLAGS="$CMAKEFLAGS -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python3.exe"
CMAKEFLAGS="$CMAKEFLAGS -DLLDB_PYTHON_EXT_SUFFIX=$EXT_SUFFIX" CMAKEFLAGS="$CMAKEFLAGS -DLLDB_PYTHON_EXT_SUFFIX=$EXT_SUFFIX"
CMAKEFLAGS="$CMAKEFLAGS -DPython3_INCLUDE_DIRS=$PREFIX/python/include/python$PYTHON_VER" CMAKEFLAGS="$CMAKEFLAGS -DPython3_INCLUDE_DIRS=$PYTHON_INCLUDE_DIR"
CMAKEFLAGS="$CMAKEFLAGS -DPython3_LIBRARIES=$PREFIX/python/lib/libpython$PYTHON_VER.dll.a" CMAKEFLAGS="$CMAKEFLAGS -DPython3_LIBRARIES=$PYTHON_LIB"
fi fi
elif [ -n "$STAGE2" ]; then elif [ -n "$STAGE2" ]; then
# Build using an earlier built and installed clang in the target directory # Build using an earlier built and installed clang in the target directory