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

Kernel: Move File.{cpp,h} into FileSystem/

Browse source 
Also tweak the kernel's Makefile to use -nostdinc and -nostdinc++.
This prevents us from picking up random headers from ../Root, which may
include older versions of kernel headers.

Since we still need <initializer_list> for Vector, we specifically include
the necessary GCC path. This is a bit hackish but it works for now.
This commit is contained in:
Andreas Kling 2019-07-09 14:46:23 +02:00
parent 6c87d3afa9
commit f4cec2f110
11 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/Makefile
View file

@ -54,7 +54,7 @@ KERNEL_OBJS = \
Devices/PCSpeaker.o \
FileSystem/InodeFile.o \
FileSystem/Custody.o \
File.o
FileSystem/File.o
VFS_OBJS = \
FileSystem/ProcFS.o \
@ -97,7 +97,9 @@ OBJS = $(CXX_OBJS) Boot/boot.ao
KERNEL = kernel
CXXFLAGS += -ffreestanding -mregparm=3 -mno-80387 -mno-mmx -mno-sse -mno-sse2
CXXFLAGS += -nostdlib
CXXFLAGS += -nostdlib -nostdinc -nostdinc++
CXXFLAGS += -I../Root/usr/local/include/c++/8.3.0/
CXXFLAGS += -I../Root/usr/local/include/c++/8.3.0/i686-pc-serenity/
DEFINES += -DKERNEL
LDFLAGS += -Ttext 0x10000 -Wl,-T linker.ld -nostdlib