Moved bastl into target/_any folder.
This commit is contained in:
parent
9b9d5ade09
commit
99b1252f5d
@ -19,7 +19,6 @@ env.Append(CPPDEFINES = ['BASTL_EXTENSIONS=1'])
|
||||
# env.Append(CCFLAGS = ['-O2'])
|
||||
|
||||
env['ISO_FILES'] = []
|
||||
env = SConscript('bastl/SConscript', exports = 'env')
|
||||
env = SConscript('targets/_any/SConscript', exports = 'env')
|
||||
env = SConscript(f'targets/{target}/SConscript', exports = 'env')
|
||||
|
||||
|
@ -8,6 +8,7 @@ any_target_sources = Split('''
|
||||
|
||||
env.Append(KERNEL_SOURCES = [env.File(f) for f in any_target_sources])
|
||||
|
||||
env = SConscript('bastl/SConscript', exports = 'env')
|
||||
env = SConscript('kernel/SConscript', exports = 'env')
|
||||
env = SConscript('stdlib/SConscript', exports = 'env')
|
||||
|
||||
|
@ -9,7 +9,7 @@ kernel_env['LD'] = 'i686-elf-g++'
|
||||
kernel_env.Append(CFLAGS = ['-ffreestanding'])
|
||||
kernel_env.Append(CXXFLAGS = ['-ffreestanding', '-fno-exceptions', '-fno-rtti', '-std=c++20'])
|
||||
kernel_env.Append(LINKFLAGS = ['-T', kernel_env.File('linker.ld').abspath, '-ffreestanding', '-nostdlib'])
|
||||
kernel_env.Append(CPPPATH = ['#targets/_any/include', '#bastl/include'])
|
||||
kernel_env.Append(CPPPATH = ['#targets/_any/include', '#targets/_any/bastl/include'])
|
||||
|
||||
def get_crt_object(name: str) -> str:
|
||||
import subprocess
|
||||
|
@ -11,7 +11,7 @@ kernel_env.Append(CFLAGS = ['-ffreestanding'])
|
||||
kernel_env.Append(CPPDEFINES = ['__baos_kernel_source__=1'])
|
||||
kernel_env.Append(CXXFLAGS = ['-ffreestanding', '-fno-exceptions', '-fno-rtti', '-std=c++20'])
|
||||
kernel_env.Append(LINKFLAGS = ['-T', kernel_env.File('linker.ld').abspath, '-ffreestanding', '-nostdlib', '-mcmodel=large', '-mno-red-zone', '-mno-mmx', '-mno-sse', '-mno-sse2'])
|
||||
kernel_env.Append(CPPPATH = ['#targets/_any/include', '#bastl/include', 'include', '/usr/include/efi', '#targets/_any/kernel/include', '#targets/_any/stdlib/include'])
|
||||
kernel_env.Append(CPPPATH = ['#targets/_any/include', '#targets/_any/bastl/include', 'include', '/usr/include/efi', '#targets/_any/kernel/include', '#targets/_any/stdlib/include'])
|
||||
|
||||
def get_crt_object(name: str) -> str:
|
||||
import subprocess
|
||||
|
Loading…
x
Reference in New Issue
Block a user