From 40ea3caf2a1368298a8e448d9aa9f26b8fb7defe Mon Sep 17 00:00:00 2001 From: Riley King-Saunders Date: Thu, 6 Mar 2025 17:59:13 +1100 Subject: [PATCH] Added ability to switch between printing stdout and stderr in error messages --- lbs.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lbs.lua b/lbs.lua index 7b304c4..38e7783 100644 --- a/lbs.lua +++ b/lbs.lua @@ -84,11 +84,11 @@ local function compile(CXX, src_dirs, include_dirs, defines, additional_argument argv[#argv+1] = args end - local ec, stdout = platform.exec_parallel(CXX, config.max_parallel, argv) + local ec, stdout, stderr = platform.exec_parallel(CXX, config.max_parallel, argv) for i,ec in pairs(ec) do if (ec ~= 0) then print("Command \"" .. CXX .. " " .. table.concat(argv[i], " ") .. "\" failed with exit code " .. tostring(ec) .. " and output;") - print(stdout[i]) + if (#stderr ~= 0) then print(stderr[i]) else print(stdout[i]) end print() end end @@ -100,10 +100,10 @@ local function link(LNK, obj_dirs, library_dirs, linker_inputs, additional_argum for _,v in pairs(linker_inputs) do argv[#argv+1] = "-l\"" .. v .. "\"" end for _,v in pairs(additional_arguments) do argv[#argv+1] = v end - local ec, stdout = platform.exec(LNK, argv) + local ec, stdout, stderr = platform.exec(LNK, argv) if (ec ~= 0) then print("Command \"" .. LNK .. " " .. table.concat(argv) .. "\" failed with exit code " .. tostring(ec) .. " and output;") - print(stdout) + if (#stderr ~= 0) then print(stderr[i]) else print(stdout[i]) end print() end end