diff options
| author | Andrew Kaster <andrewdkaster@gmail.com> | 2020-05-18 18:54:51 -0600 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-05-20 08:37:50 +0200 |
| commit | c1eb744ff0a82cf6c8e3470ac10e2f417c7d9de2 (patch) | |
| tree | 02aca2ec7136f8ceb24221506aedffb80e62aa4f /Userland | |
| parent | cdbbe14062ea49f9a9d9b0e5627aba9efd07659a (diff) | |
| download | serenity-c1eb744ff0a82cf6c8e3470ac10e2f417c7d9de2.zip | |
Build: Include headers from LibC, LibM, and LibPthread with -isystem
Make sure that userspace is always referencing "system" headers in a way
that would build on target :). This means removing the explicit
include_directories of Libraries/LibC in favor of having it export its
headers as SYSTEM. Also remove a redundant include_directories of
Libraries in the 'serenity build' part of the build script. It's already
set at the top.
This causes issues for the Kernel, and for crt0.o. These special cases
are handled individually.
Diffstat (limited to 'Userland')
| -rw-r--r-- | Userland/functrace.cpp | 2 | ||||
| -rw-r--r-- | Userland/strace.cpp | 2 | ||||
| -rw-r--r-- | Userland/test-crypto.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Userland/functrace.cpp b/Userland/functrace.cpp index 877a7aa601..4e30d12fd8 100644 --- a/Userland/functrace.cpp +++ b/Userland/functrace.cpp @@ -33,7 +33,6 @@ #include <AK/StringBuilder.h> #include <AK/kmalloc.h> #include <Kernel/Syscall.h> -#include <LibC/sys/arch/i386/regs.h> #include <LibCore/File.h> #include <LibDebug/DebugSession.h> #include <LibELF/Image.h> @@ -44,6 +43,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/arch/i386/regs.h> #include <unistd.h> static int usage() diff --git a/Userland/strace.cpp b/Userland/strace.cpp index b6687cfa58..58e018d575 100644 --- a/Userland/strace.cpp +++ b/Userland/strace.cpp @@ -28,11 +28,11 @@ #include <AK/LogStream.h> #include <AK/Types.h> #include <Kernel/Syscall.h> -#include <LibC/sys/arch/i386/regs.h> #include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/arch/i386/regs.h> #include <sys/ptrace.h> #include <sys/wait.h> #include <unistd.h> diff --git a/Userland/test-crypto.cpp b/Userland/test-crypto.cpp index 4f22de89c1..2b0fb8b9f5 100644 --- a/Userland/test-crypto.cpp +++ b/Userland/test-crypto.cpp @@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibC/limits.h> #include <LibCore/ArgsParser.h> #include <LibCore/EventLoop.h> #include <LibCore/File.h> @@ -37,6 +36,7 @@ #include <LibCrypto/PK/RSA.h> #include <LibLine/Editor.h> #include <LibTLS/TLSv12.h> +#include <limits.h> #include <stdio.h> #include <time.h> |