From 60179d8c952f48d4ee28dc6e9e12332dac20cf20 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 17 Jun 2022 23:51:57 +1000 Subject: Acknowledge presence of circular dependencies to keep GNU ld happy on Linux. --- scripts/genie.lua | 3 +++ scripts/src/main.lua | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index dcffb53a0b6..37b8ee967e2 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1242,6 +1242,9 @@ configuration { "linux-*" } "dl", "rt", } + flags { + "LinkSupportCircularDependencies", + } if _OPTIONS["distro"]=="debian-stable" then defines { diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 12e42834cd0..ce31dd7f5c4 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -107,12 +107,6 @@ end if (STANDALONE~=true) then findfunction("linkProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"]) end - links { - "osd_" .. _OPTIONS["osd"], - } - links { - "qtdbg_" .. _OPTIONS["osd"], - } if (STANDALONE~=true) then links { "frontend", @@ -122,6 +116,12 @@ end "optional", "emu", } + links { + "osd_" .. _OPTIONS["osd"], + } + links { + "qtdbg_" .. _OPTIONS["osd"], + } --if (STANDALONE~=true) then links { "formats", -- cgit v1.2.3