RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:17:44 +00:00
Code Issues Activity Actions

Ports: Add variables for Toolchain binary directory and cxxfilt

Browse source
This commit is contained in:
Andrew Kaster 2022-06-11 16:32:24 -06:00 • committed by Andreas Kling
parent fef83ed47d
commit 8c877664f7
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ports/.hosted_defs.sh
View file

@ -14,6 +14,7 @@ if [ -z "${HOST_CC:=}" ]; then
export HOST_READELF="${READELF:=readelf}" export HOST_READELF="${READELF:=readelf}"
export HOST_OBJCOPY="${OBJCOPY:=objcopy}" export HOST_OBJCOPY="${OBJCOPY:=objcopy}"
export HOST_STRIP="${STRIP:=strip}" export HOST_STRIP="${STRIP:=strip}"
export HOST_CXXFILT="${CXXFILT:=c++filt}"
export HOST_PKG_CONFIG_DIR="${PKG_CONFIG_DIR:=}" export HOST_PKG_CONFIG_DIR="${PKG_CONFIG_DIR:=}"
export HOST_PKG_CONFIG_SYSROOT_DIR="${PKG_CONFIG_SYSROOT_DIR:=}" export HOST_PKG_CONFIG_SYSROOT_DIR="${PKG_CONFIG_SYSROOT_DIR:=}"
export HOST_PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:=}" export HOST_PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:=}"
@ -23,6 +24,7 @@ export SERENITY_SOURCE_DIR="$(realpath "${SCRIPT}/../")"
if [ "$SERENITY_TOOLCHAIN" = "Clang" ]; then if [ "$SERENITY_TOOLCHAIN" = "Clang" ]; then
export SERENITY_BUILD_DIR="${SERENITY_SOURCE_DIR}/Build/${SERENITY_ARCH}clang" export SERENITY_BUILD_DIR="${SERENITY_SOURCE_DIR}/Build/${SERENITY_ARCH}clang"
export SERENITY_TOOLCHAIN_BINDIR="${SERENITY_SOURCE_DIR}/Toolchain/Local/clang/bin"
export CC="clang --target=${SERENITY_ARCH}-pc-serenity --sysroot=${SERENITY_BUILD_DIR}/Root" export CC="clang --target=${SERENITY_ARCH}-pc-serenity --sysroot=${SERENITY_BUILD_DIR}/Root"
export CXX="clang++ --target=${SERENITY_ARCH}-pc-serenity --sysroot=${SERENITY_BUILD_DIR}/Root" export CXX="clang++ --target=${SERENITY_ARCH}-pc-serenity --sysroot=${SERENITY_BUILD_DIR}/Root"
export AR="llvm-ar" export AR="llvm-ar"
@ -30,9 +32,10 @@ if [ "$SERENITY_TOOLCHAIN" = "Clang" ]; then
export READELF="llvm-readelf" export READELF="llvm-readelf"
export OBJCOPY="llvm-objcopy" export OBJCOPY="llvm-objcopy"
export STRIP="llvm-strip" export STRIP="llvm-strip"
export PATH="${SERENITY_SOURCE_DIR}/Toolchain/Local/clang/bin:${HOST_PATH}" export CXXFILT="llvm-cxxfilt"
else else
export SERENITY_BUILD_DIR="${SERENITY_SOURCE_DIR}/Build/${SERENITY_ARCH}" export SERENITY_BUILD_DIR="${SERENITY_SOURCE_DIR}/Build/${SERENITY_ARCH}"
export SERENITY_TOOLCHAIN_BINDIR="${SERENITY_SOURCE_DIR}/Toolchain/Local/${SERENITY_ARCH}/bin"
export CC="${SERENITY_ARCH}-pc-serenity-gcc" export CC="${SERENITY_ARCH}-pc-serenity-gcc"
export CXX="${SERENITY_ARCH}-pc-serenity-g++" export CXX="${SERENITY_ARCH}-pc-serenity-g++"
export AR="${SERENITY_ARCH}-pc-serenity-ar" export AR="${SERENITY_ARCH}-pc-serenity-ar"
@ -40,9 +43,11 @@ else
export READELF="${SERENITY_ARCH}-pc-serenity-readelf" export READELF="${SERENITY_ARCH}-pc-serenity-readelf"
export OBJCOPY="${SERENITY_ARCH}-pc-serenity-objcopy" export OBJCOPY="${SERENITY_ARCH}-pc-serenity-objcopy"
export STRIP="${SERENITY_ARCH}-pc-serenity-strip" export STRIP="${SERENITY_ARCH}-pc-serenity-strip"
export PATH="${SERENITY_SOURCE_DIR}/Toolchain/Local/${SERENITY_ARCH}/bin:${HOST_PATH}" export CXXFILT="${SERENITY_ARCH}-pc-serenity-c++filt"
fi fi
export PATH="${SERENITY_TOOLCHAIN_BINDIR}:${HOST_PATH}"
export PKG_CONFIG_DIR="" export PKG_CONFIG_DIR=""
export PKG_CONFIG_SYSROOT_DIR="${SERENITY_BUILD_DIR}/Root" export PKG_CONFIG_SYSROOT_DIR="${SERENITY_BUILD_DIR}/Root"
export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/usr/local/lib/pkgconfig" export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/usr/local/lib/pkgconfig"

1
Ports/.port_include.sh
View file

@ -52,6 +52,7 @@ host_env() {
export READELF="${HOST_READELF}" export READELF="${HOST_READELF}"
export OBJCOPY="${HOST_OBJCOPY}" export OBJCOPY="${HOST_OBJCOPY}"
export STRIP="${HOST_STRIP}" export STRIP="${HOST_STRIP}"
export CXXFILT="${HOST_CXXFILT}"
export PKG_CONFIG_DIR="${HOST_PKG_CONFIG_DIR}" export PKG_CONFIG_DIR="${HOST_PKG_CONFIG_DIR}"
export PKG_CONFIG_SYSROOT_DIR="${HOST_PKG_CONFIG_SYSROOT_DIR}" export PKG_CONFIG_SYSROOT_DIR="${HOST_PKG_CONFIG_SYSROOT_DIR}"
export PKG_CONFIG_LIBDIR="${HOST_PKG_CONFIG_LIBDIR}" export PKG_CONFIG_LIBDIR="${HOST_PKG_CONFIG_LIBDIR}"