From e3dd28450807c05c7e5c2a878d8506c839b4857e Mon Sep 17 00:00:00 2001 From: Reece Date: Mon, 21 Mar 2022 05:13:45 +0000 Subject: [PATCH] [*] regression in build action bootstrap since linux --- Core/Actions/buildActionBootstrap.lua | 11 ++++++++++- Core/Target/Target.lua | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Core/Actions/buildActionBootstrap.lua b/Core/Actions/buildActionBootstrap.lua index c37abea..ae78c8b 100644 --- a/Core/Actions/buildActionBootstrap.lua +++ b/Core/Actions/buildActionBootstrap.lua @@ -114,6 +114,15 @@ local projPlatform = _OPTIONS["project_platform"] local projCfg = _OPTIONS["project_config"] local projArch = _OPTIONS["project_arch"] +local target = auRequire("Core/Target") + +for k, v in pairs(Aurora.Architectures) do + if (projArch == v.architecture) then + projArch = k + break + end +end + if (string.ends(projPlatform, projArch)) then projPlatform = projPlatform:sub(1, - #projArch - 1) end @@ -122,7 +131,7 @@ if (string.find(projCfg, "|")) then projCfg = projCfg:match("([^,]+)|([^,]+)") end -auRequire("Core/Target").defineOutputNames(projPlatform) +target.defineOutputNames(projPlatform) local platform = Aurora.Platforms[projPlatform] local platformStyle = projPlatform diff --git a/Core/Target/Target.lua b/Core/Target/Target.lua index 4f318a0..ab28bd9 100644 --- a/Core/Target/Target.lua +++ b/Core/Target/Target.lua @@ -25,6 +25,11 @@ end local function defineOutputNames(platformName) local name = nil + + if (not platformName) then + return + end + local alt = Aurora.Platforms[platformName].stylizedName if (alt) then