mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 14:47:46 +00:00
Everywhere: Fully remove the separate LibPthread directory
This commit is contained in:
parent
dac361e330
commit
28061cf94d
9 changed files with 10 additions and 16 deletions
|
@ -248,14 +248,14 @@ popd
|
|||
# === COPY HEADERS ===
|
||||
|
||||
SRC_ROOT=$($REALPATH "$DIR"/..)
|
||||
FILES=$(find "$SRC_ROOT"/Kernel/API "$SRC_ROOT"/Userland/Libraries/LibC "$SRC_ROOT"/Userland/Libraries/LibM "$SRC_ROOT"/Userland/Libraries/LibPthread "$SRC_ROOT"/Userland/Libraries/LibDl -name '*.h' -print)
|
||||
FILES=$(find "$SRC_ROOT"/Kernel/API "$SRC_ROOT"/Userland/Libraries/LibC "$SRC_ROOT"/Userland/Libraries/LibM "$SRC_ROOT"/Userland/Libraries/LibDl -name '*.h' -print)
|
||||
|
||||
for arch in $ARCHS; do
|
||||
mkdir -p "$BUILD/${arch}clang"
|
||||
pushd "$BUILD/${arch}clang"
|
||||
mkdir -p Root/usr/include/
|
||||
for header in $FILES; do
|
||||
target=$(echo "$header" | "$SED" -e "s@$SRC_ROOT/Userland/Libraries/LibC@@" -e "s@$SRC_ROOT/Userland/Libraries/LibM@@" -e "s@$SRC_ROOT/Userland/Libraries/LibPthread@@" -e "s@$SRC_ROOT/Userland/Libraries/LibDl@@" -e "s@$SRC_ROOT/Kernel/@Kernel/@")
|
||||
target=$(echo "$header" | "$SED" -e "s@$SRC_ROOT/Userland/Libraries/LibC@@" -e "s@$SRC_ROOT/Userland/Libraries/LibM@@" -e "s@$SRC_ROOT/Userland/Libraries/LibDl@@" -e "s@$SRC_ROOT/Kernel/@Kernel/@")
|
||||
buildstep "system_headers" "$INSTALL" -D "$header" "Root/usr/include/$target"
|
||||
done
|
||||
popd
|
||||
|
|
|
@ -363,7 +363,7 @@ pushd "$DIR/Build/$ARCH"
|
|||
buildstep "binutils/install" "$MAKE" install || exit 1
|
||||
popd
|
||||
|
||||
echo "XXX serenity libc, libdl, libm and libpthread headers"
|
||||
echo "XXX serenity libc, libdl and libm headers"
|
||||
mkdir -p "$BUILD"
|
||||
pushd "$BUILD"
|
||||
mkdir -p Root/usr/include/
|
||||
|
@ -375,7 +375,6 @@ pushd "$DIR/Build/$ARCH"
|
|||
"$SRC_ROOT"/Userland/Libraries/LibC \
|
||||
"$SRC_ROOT"/Userland/Libraries/LibDl \
|
||||
"$SRC_ROOT"/Userland/Libraries/LibM \
|
||||
"$SRC_ROOT"/Userland/Libraries/LibPthread \
|
||||
-name '*.h' -print)
|
||||
for header in $FILES; do
|
||||
target=$(echo "$header" | sed \
|
||||
|
@ -383,7 +382,6 @@ pushd "$DIR/Build/$ARCH"
|
|||
-e "s@$SRC_ROOT/Userland/Libraries/LibC@@" \
|
||||
-e "s@$SRC_ROOT/Userland/Libraries/LibDl@@" \
|
||||
-e "s@$SRC_ROOT/Userland/Libraries/LibM@@" \
|
||||
-e "s@$SRC_ROOT/Userland/Libraries/LibPthread@@" \
|
||||
-e "s@$SRC_ROOT/Kernel/@Kernel/@")
|
||||
buildstep "system_headers" $INSTALL -D "$header" "Root/usr/include/$target"
|
||||
done
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue