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

Ports: Use $arch-serenity-pc-clang{++} for CC and CXX

Browse source 
This lets us eliminate the extra arguments on CC and CXX for ports that
care about CC and CXX pointing to actual filenames they can invoke
realpath or basename on.
This commit is contained in:
Andrew Kaster 2022-06-11 16:29:05 -06:00 • committed by Andreas Kling
parent 8c877664f7
commit ad0a001f0a
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ports/.hosted_defs.sh
View file

@ -25,14 +25,20 @@ 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 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="${SERENITY_ARCH}-pc-serenity-clang"
export CXX="clang++ --target=${SERENITY_ARCH}-pc-serenity --sysroot=${SERENITY_BUILD_DIR}/Root" export CXX="${SERENITY_ARCH}-pc-serenity-clang++"
export AR="llvm-ar" export AR="llvm-ar"
export RANLIB="llvm-ranlib" export RANLIB="llvm-ranlib"
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 CXXFILT="llvm-cxxfilt" export CXXFILT="llvm-cxxfilt"
# FIXME: Remove after next toolchain update (symlinks already in BuildClang.sh)
if [ ! -f "${SERENITY_TOOLCHAIN_BINDIR}/${SERENITY_ARCH}-pc-serenity-clang" ]; then
ln -s clang "${SERENITY_TOOLCHAIN_BINDIR}/${SERENITY_ARCH}-pc-serenity-clang"
ln -s clang++ "${SERENITY_TOOLCHAIN_BINDIR}/${SERENITY_ARCH}-pc-serenity-clang++"
echo "--sysroot=${SERENITY_BUILD_DIR}/Root" > "${SERENITY_TOOLCHAIN_BINDIR}/${SERENITY_ARCH}-pc-serenity.cfg"
fi
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 SERENITY_TOOLCHAIN_BINDIR="${SERENITY_SOURCE_DIR}/Toolchain/Local/${SERENITY_ARCH}/bin"

8
Ports/.port_include.sh
View file

@ -28,15 +28,9 @@ enable_ccache() {
if [ "${USE_CCACHE:-true}" = "true" ] && command -v ccache &>/dev/null; then if [ "${USE_CCACHE:-true}" = "true" ] && command -v ccache &>/dev/null; then
ccache_tooldir="${SERENITY_BUILD_DIR}/ccache" ccache_tooldir="${SERENITY_BUILD_DIR}/ccache"
mkdir -p "$ccache_tooldir" mkdir -p "$ccache_tooldir"
if [ "$SERENITY_TOOLCHAIN" = "Clang" ]; then for tool in cc clang gcc c++ clang++ g++; do
for tool in clang clang++; do
ln -sf "$(command -v ccache)" "${ccache_tooldir}/$tool"
done
else
for tool in gcc g++ c++; do
ln -sf "$(command -v ccache)" "${ccache_tooldir}/${SERENITY_ARCH}-pc-serenity-${tool}" ln -sf "$(command -v ccache)" "${ccache_tooldir}/${SERENITY_ARCH}-pc-serenity-${tool}"
done done
fi
export PATH="${ccache_tooldir}:$PATH" export PATH="${ccache_tooldir}:$PATH"
fi fi
} }