diff options
Diffstat (limited to 'Libraries')
| -rw-r--r-- | Libraries/LibC/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Libraries/LibDebug/DebugSession.h | 2 | ||||
| -rw-r--r-- | Libraries/LibM/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Libraries/LibM/math.cpp | 4 | ||||
| -rw-r--r-- | Libraries/LibPthread/CMakeLists.txt | 1 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Libraries/LibC/CMakeLists.txt b/Libraries/LibC/CMakeLists.txt index d5e94d1b96..feee96aa97 100644 --- a/Libraries/LibC/CMakeLists.txt +++ b/Libraries/LibC/CMakeLists.txt @@ -52,6 +52,8 @@ file(GLOB ELF_SOURCES "../LibELF/*.cpp") set(ELF_SOURCES ${ELF_SOURCES} ../LibELF/Arch/i386/plt_trampoline.S) add_library(crt0 STATIC crt0.cpp) +# We need include headers from LibC in crt0. namely, <assert.h> +target_include_directories(crt0 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) add_custom_command( TARGET crt0 COMMAND install -D $<TARGET_OBJECTS:crt0> ${CMAKE_INSTALL_PREFIX}/usr/lib/crt0.o diff --git a/Libraries/LibDebug/DebugSession.h b/Libraries/LibDebug/DebugSession.h index 20a549f777..95687926c3 100644 --- a/Libraries/LibDebug/DebugSession.h +++ b/Libraries/LibDebug/DebugSession.h @@ -33,11 +33,11 @@ #include <AK/Optional.h> #include <AK/OwnPtr.h> #include <AK/String.h> -#include <LibC/sys/arch/i386/regs.h> #include <LibDebug/DebugInfo.h> #include <LibELF/Loader.h> #include <signal.h> #include <stdio.h> +#include <sys/arch/i386/regs.h> #include <sys/ptrace.h> #include <sys/wait.h> #include <unistd.h> diff --git a/Libraries/LibM/CMakeLists.txt b/Libraries/LibM/CMakeLists.txt index 7ed9959738..c9bf4dd655 100644 --- a/Libraries/LibM/CMakeLists.txt +++ b/Libraries/LibM/CMakeLists.txt @@ -3,5 +3,4 @@ set(SOURCES ) serenity_libc(LibM m) -target_include_directories(LibM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(LibM LibC) diff --git a/Libraries/LibM/math.cpp b/Libraries/LibM/math.cpp index 021993e9d4..26e9642296 100644 --- a/Libraries/LibM/math.cpp +++ b/Libraries/LibM/math.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibC/assert.h> -#include <LibM/math.h> +#include <assert.h> +#include <math.h> #include <stdint.h> #include <stdlib.h> diff --git a/Libraries/LibPthread/CMakeLists.txt b/Libraries/LibPthread/CMakeLists.txt index 7a668f0684..3fd2e1d702 100644 --- a/Libraries/LibPthread/CMakeLists.txt +++ b/Libraries/LibPthread/CMakeLists.txt @@ -4,4 +4,3 @@ set(SOURCES serenity_libc(LibPthread pthread) target_link_libraries(LibPthread LibC) -target_include_directories(LibPthread PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) |