mewin/bad_apple_os
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Attempt to not make the build fail if x86_64-elf-g++ is missing if it's not actually required.

Browse Source
This commit is contained in:
Patrick 2024-02-03 02:24:42 +01:00
parent 3ec4fa78b4
commit 07e8225be2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
targets/x86_64/SConscript
View File

@ -19,8 +19,11 @@ def get_crt_object(name: str) -> str:
cmd = [kernel_env['CXX']] cmd = [kernel_env['CXX']]
cmd.extend(kernel_env['CXXFLAGS']) cmd.extend(kernel_env['CXXFLAGS'])
cmd.append(f'-print-file-name={name}') cmd.append(f'-print-file-name={name}')
try:
result = subprocess.run(cmd, stdout=subprocess.PIPE) result = subprocess.run(cmd, stdout=subprocess.PIPE)
return result.stdout.decode('utf-8').strip() return result.stdout.decode('utf-8').strip()
except:
return "XXX_COULD_NOT_BE_DETERMINED_XXX" # TODO: better error handling?
crtbegin_o = get_crt_object('crtbegin.o') crtbegin_o = get_crt_object('crtbegin.o')
crtend_o = get_crt_object('crtend.o') crtend_o = get_crt_object('crtend.o')