1
0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-09 07:40:45 +00:00

Toolchain+Ports: Install host python into Local/python, not Local/$ARCH

Following the pattern for qemu, mold, and clang, we should install the
host python required to build the python port into its own install tree
rather than forcing it into the GNU compiler's bindir.
This commit is contained in:
Andrew Kaster 2022-06-16 02:29:25 -06:00 committed by Linus Groh
parent 242bbf1be4
commit dcc0f299be
2 changed files with 6 additions and 5 deletions

View File

@ -2,6 +2,8 @@
source version.sh
export PATH="${SERENITY_SOURCE_DIR}/Toolchain/Local/python/bin:${PATH}"
port=python3
version="${PYTHON_VERSION}"
workdir="Python-${version}"

View File

@ -5,9 +5,8 @@ set -e
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
ARCH=${ARCH:-"i686"}
PREFIX_DIR="$DIR/Local/$ARCH"
BUILD_DIR="$DIR/Build/$ARCH"
PREFIX_DIR="$DIR/Local/python"
BUILD_DIR="$DIR/Build/python"
TARBALLS_DIR="$DIR/Tarballs"
# shellcheck source=/dev/null
@ -42,9 +41,9 @@ if [ -z "$MAKEJOBS" ]; then
fi
mkdir -p "${PREFIX_DIR}"
mkdir -p "${BUILD_DIR}/python"
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}/python"
pushd "${BUILD_DIR}"
"${TARBALLS_DIR}"/Python-"${PYTHON_VERSION}"/configure --prefix="${PREFIX_DIR}"
make -j "${MAKEJOBS}"
make install