From 07e8225be2ffb3070537b808bb65c5df900a678c Mon Sep 17 00:00:00 2001 From: Patrick Wuttke Date: Sat, 3 Feb 2024 02:24:42 +0100 Subject: [PATCH] Attempt to not make the build fail if x86_64-elf-g++ is missing if it's not actually required. --- targets/x86_64/SConscript | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/targets/x86_64/SConscript b/targets/x86_64/SConscript index b57b0fc..67f680f 100644 --- a/targets/x86_64/SConscript +++ b/targets/x86_64/SConscript @@ -19,8 +19,11 @@ def get_crt_object(name: str) -> str: cmd = [kernel_env['CXX']] cmd.extend(kernel_env['CXXFLAGS']) cmd.append(f'-print-file-name={name}') - result = subprocess.run(cmd, stdout=subprocess.PIPE) - return result.stdout.decode('utf-8').strip() + try: + result = subprocess.run(cmd, stdout=subprocess.PIPE) + 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') crtend_o = get_crt_object('crtend.o')