mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-11 13:36:13 +03:00
Everywhere: Fully remove the separate LibM directory
This commit is contained in:
parent
bbcdd0dca0
commit
1b25c38b8b
Notes:
sideshowbarker
2024-07-17 09:56:35 +09:00
Author: https://github.com/timschumi Commit: https://github.com/SerenityOS/serenity/commit/1b25c38b8b Pull-request: https://github.com/SerenityOS/serenity/pull/15149 Reviewed-by: https://github.com/ADKaster ✅
@ -188,7 +188,6 @@ include_directories(.)
|
|||||||
include_directories(Userland/Libraries)
|
include_directories(Userland/Libraries)
|
||||||
include_directories(Userland/Libraries/LibC)
|
include_directories(Userland/Libraries/LibC)
|
||||||
include_directories(Userland/Libraries/LibCrypt)
|
include_directories(Userland/Libraries/LibCrypt)
|
||||||
include_directories(Userland/Libraries/LibM)
|
|
||||||
include_directories(Userland/Libraries/LibSystem)
|
include_directories(Userland/Libraries/LibSystem)
|
||||||
include_directories(Userland/Services)
|
include_directories(Userland/Services)
|
||||||
include_directories(Userland)
|
include_directories(Userland)
|
||||||
|
@ -23,7 +23,6 @@ Userland/
|
|||||||
Userland/Services/
|
Userland/Services/
|
||||||
Userland/Libraries/
|
Userland/Libraries/
|
||||||
Userland/Libraries/LibC/
|
Userland/Libraries/LibC/
|
||||||
Userland/Libraries/LibM/
|
|
||||||
Userland/Libraries/LibSystem/
|
Userland/Libraries/LibSystem/
|
||||||
Toolchain/Local/i686/i686-pc-serenity/include/c++/12.1.0
|
Toolchain/Local/i686/i686-pc-serenity/include/c++/12.1.0
|
||||||
Build/i686/
|
Build/i686/
|
||||||
|
@ -45,7 +45,6 @@ These extensions can be used as-is, but you need to point them to the custom Ser
|
|||||||
"${workspaceFolder}/Userland",
|
"${workspaceFolder}/Userland",
|
||||||
"${workspaceFolder}/Userland/Libraries",
|
"${workspaceFolder}/Userland/Libraries",
|
||||||
"${workspaceFolder}/Userland/Libraries/LibC",
|
"${workspaceFolder}/Userland/Libraries/LibC",
|
||||||
"${workspaceFolder}/Userland/Libraries/LibM",
|
|
||||||
"${workspaceFolder}/Userland/Services",
|
"${workspaceFolder}/Userland/Services",
|
||||||
"${workspaceFolder}/Toolchain/Local/i686/i686-pc-serenity/include/c++/**"
|
"${workspaceFolder}/Toolchain/Local/i686/i686-pc-serenity/include/c++/**"
|
||||||
],
|
],
|
||||||
@ -75,7 +74,6 @@ These extensions can be used as-is, but you need to point them to the custom Ser
|
|||||||
"${workspaceFolder}/Userland",
|
"${workspaceFolder}/Userland",
|
||||||
"${workspaceFolder}/Userland/Libraries",
|
"${workspaceFolder}/Userland/Libraries",
|
||||||
"${workspaceFolder}/Userland/Libraries/LibC",
|
"${workspaceFolder}/Userland/Libraries/LibC",
|
||||||
"${workspaceFolder}/Userland/Libraries/LibM",
|
|
||||||
"${workspaceFolder}/Userland/Services",
|
"${workspaceFolder}/Userland/Services",
|
||||||
"${workspaceFolder}/Toolchain/Local/i686/i686-pc-serenity/include/c++/**"
|
"${workspaceFolder}/Toolchain/Local/i686/i686-pc-serenity/include/c++/**"
|
||||||
],
|
],
|
||||||
|
@ -248,14 +248,14 @@ popd
|
|||||||
# === COPY HEADERS ===
|
# === COPY HEADERS ===
|
||||||
|
|
||||||
SRC_ROOT=$($REALPATH "$DIR"/..)
|
SRC_ROOT=$($REALPATH "$DIR"/..)
|
||||||
FILES=$(find "$SRC_ROOT"/Kernel/API "$SRC_ROOT"/Userland/Libraries/LibC "$SRC_ROOT"/Userland/Libraries/LibM -name '*.h' -print)
|
FILES=$(find "$SRC_ROOT"/Kernel/API "$SRC_ROOT"/Userland/Libraries/LibC -name '*.h' -print)
|
||||||
|
|
||||||
for arch in $ARCHS; do
|
for arch in $ARCHS; do
|
||||||
mkdir -p "$BUILD/${arch}clang"
|
mkdir -p "$BUILD/${arch}clang"
|
||||||
pushd "$BUILD/${arch}clang"
|
pushd "$BUILD/${arch}clang"
|
||||||
mkdir -p Root/usr/include/
|
mkdir -p Root/usr/include/
|
||||||
for header in $FILES; do
|
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/Kernel/@Kernel/@")
|
target=$(echo "$header" | "$SED" -e "s@$SRC_ROOT/Userland/Libraries/LibC@@" -e "s@$SRC_ROOT/Kernel/@Kernel/@")
|
||||||
buildstep "system_headers" "$INSTALL" -D "$header" "Root/usr/include/$target"
|
buildstep "system_headers" "$INSTALL" -D "$header" "Root/usr/include/$target"
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
@ -363,7 +363,7 @@ pushd "$DIR/Build/$ARCH"
|
|||||||
buildstep "binutils/install" "$MAKE" install || exit 1
|
buildstep "binutils/install" "$MAKE" install || exit 1
|
||||||
popd
|
popd
|
||||||
|
|
||||||
echo "XXX serenity libc and libm headers"
|
echo "XXX serenity libc headers"
|
||||||
mkdir -p "$BUILD"
|
mkdir -p "$BUILD"
|
||||||
pushd "$BUILD"
|
pushd "$BUILD"
|
||||||
mkdir -p Root/usr/include/
|
mkdir -p Root/usr/include/
|
||||||
@ -373,13 +373,11 @@ pushd "$DIR/Build/$ARCH"
|
|||||||
"$SRC_ROOT"/Kernel/API \
|
"$SRC_ROOT"/Kernel/API \
|
||||||
"$SRC_ROOT"/Kernel/Arch \
|
"$SRC_ROOT"/Kernel/Arch \
|
||||||
"$SRC_ROOT"/Userland/Libraries/LibC \
|
"$SRC_ROOT"/Userland/Libraries/LibC \
|
||||||
"$SRC_ROOT"/Userland/Libraries/LibM \
|
|
||||||
-name '*.h' -print)
|
-name '*.h' -print)
|
||||||
for header in $FILES; do
|
for header in $FILES; do
|
||||||
target=$(echo "$header" | sed \
|
target=$(echo "$header" | sed \
|
||||||
-e "s@$SRC_ROOT/AK/@AK/@" \
|
-e "s@$SRC_ROOT/AK/@AK/@" \
|
||||||
-e "s@$SRC_ROOT/Userland/Libraries/LibC@@" \
|
-e "s@$SRC_ROOT/Userland/Libraries/LibC@@" \
|
||||||
-e "s@$SRC_ROOT/Userland/Libraries/LibM@@" \
|
|
||||||
-e "s@$SRC_ROOT/Kernel/@Kernel/@")
|
-e "s@$SRC_ROOT/Kernel/@Kernel/@")
|
||||||
buildstep "system_headers" $INSTALL -D "$header" "Root/usr/include/$target"
|
buildstep "system_headers" $INSTALL -D "$header" "Root/usr/include/$target"
|
||||||
done
|
done
|
||||||
|
@ -33,7 +33,6 @@ add_subdirectory(LibJS)
|
|||||||
add_subdirectory(LibKeyboard)
|
add_subdirectory(LibKeyboard)
|
||||||
add_subdirectory(LibLine)
|
add_subdirectory(LibLine)
|
||||||
add_subdirectory(LibLocale)
|
add_subdirectory(LibLocale)
|
||||||
add_subdirectory(LibM)
|
|
||||||
add_subdirectory(LibMain)
|
add_subdirectory(LibMain)
|
||||||
add_subdirectory(LibMarkdown)
|
add_subdirectory(LibMarkdown)
|
||||||
add_subdirectory(LibPartition)
|
add_subdirectory(LibPartition)
|
||||||
|
@ -184,3 +184,8 @@ add_dependencies(LibC LibM LibSystem LibCStatic)
|
|||||||
# Provide a linker script instead of various other libraries that tells everything to link against LibC.
|
# Provide a linker script instead of various other libraries that tells everything to link against LibC.
|
||||||
file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libpthread.so" "INPUT(libc.so)")
|
file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libpthread.so" "INPUT(libc.so)")
|
||||||
file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libdl.so" "INPUT(libc.so)")
|
file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libdl.so" "INPUT(libc.so)")
|
||||||
|
|
||||||
|
# Provide a dummy target and a linker script for LibM that tells everything to link against LibC instead.
|
||||||
|
add_library(LibM INTERFACE)
|
||||||
|
target_link_libraries(LibM INTERFACE LibC)
|
||||||
|
file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libm.so" "INPUT(libc.so)")
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
# Provide a dummy target and a linker script that tells everything to link against LibC instead.
|
|
||||||
add_library(LibM INTERFACE)
|
|
||||||
target_link_libraries(LibM INTERFACE LibC)
|
|
||||||
file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libm.so" "INPUT(libc.so)")
|
|
Loading…
Reference in New Issue
Block a user