From 246d8af764f10d947b59e22deb67be99d0f91157 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Sun, 20 Apr 2025 17:53:07 +0200 Subject: (runtimes) runtimes flags should be first to avoid -L/usr/lib make linker choose wrong libraries --- xmake/languages/asm/xmake.lua | 8 ++++---- xmake/languages/c++/xmake.lua | 12 ++++++------ xmake/languages/c/xmake.lua | 12 ++++++------ xmake/languages/cuda/xmake.lua | 10 ++++++---- xmake/languages/objc++/xmake.lua | 9 ++++++--- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/xmake/languages/asm/xmake.lua b/xmake/languages/asm/xmake.lua index 66115f65b..63f7eac4d 100644 --- a/xmake/languages/asm/xmake.lua +++ b/xmake/languages/asm/xmake.lua @@ -31,7 +31,8 @@ language("asm") set_nameflags { object = { - "config.includedirs" + "target.runtimes" + , "config.includedirs" , "target.symbols" , "target.warnings" , "target.optimize:check" @@ -40,7 +41,6 @@ language("asm") , "target.includedirs" , "target.defines" , "target.undefines" - , "target.runtimes" , "toolchain.includedirs" , "toolchain.defines" , "toolchain.undefines" @@ -48,12 +48,12 @@ language("asm") , "toolchain.sysincludedirs" } , binary = { - "config.linkdirs" + "target.runtimes" + , "config.linkdirs" , "target.linkdirs" , "target.rpathdirs" , "target.strip" , "target.symbols" - , "target.runtimes" , "toolchain.linkdirs" , "toolchain.rpathdirs" , "config.links" diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua index 5e3121db7..24115dbb7 100644 --- a/xmake/languages/c++/xmake.lua +++ b/xmake/languages/c++/xmake.lua @@ -32,7 +32,8 @@ language("c++") set_nameflags { object = { - "config.includedirs" + "target.runtimes" + , "config.includedirs" , "config.frameworkdirs" , "config.frameworks" , "target.symbols" @@ -41,7 +42,6 @@ language("c++") , "target.optimize:check" , "target.vectorexts:check" , "target.languages" - , "target.runtimes" , "target.pcxxheader" , "target.includedirs" , "target.defines" @@ -60,7 +60,8 @@ language("c++") , "toolchain.sysincludedirs" } , binary = { - "config.linkdirs" + "target.runtimes" + , "config.linkdirs" , "config.frameworkdirs" , "target.linkdirs" , "target.frameworkdirs" @@ -68,7 +69,6 @@ language("c++") , "target.strip" , "target.symbols" , "target.optimize:check" - , "target.runtimes" , "toolchain.linkdirs" , "toolchain.rpathdirs" , "toolchain.frameworkdirs" @@ -84,7 +84,8 @@ language("c++") , "toolchain.syslinks" } , shared = { - "config.linkdirs" + "target.runtimes" + , "config.linkdirs" , "config.frameworkdirs" , "target.linkdirs" , "target.frameworkdirs" @@ -92,7 +93,6 @@ language("c++") , "target.strip" , "target.symbols" , "target.optimize:check" - , "target.runtimes" , "toolchain.linkdirs" , "toolchain.rpathdirs" , "toolchain.frameworkdirs" diff --git a/xmake/languages/c/xmake.lua b/xmake/languages/c/xmake.lua index a9f7418eb..8fb67b6b1 100644 --- a/xmake/languages/c/xmake.lua +++ b/xmake/languages/c/xmake.lua @@ -32,7 +32,8 @@ language("c") set_nameflags { object = { - "config.includedirs" + "target.runtimes" + , "config.includedirs" , "config.frameworkdirs" , "config.frameworks" , "target.symbols" @@ -41,7 +42,6 @@ language("c") , "target.optimize:check" , "target.vectorexts:check" , "target.languages" - , "target.runtimes" , "target.pcheader" , "target.includedirs" , "target.defines" @@ -60,7 +60,8 @@ language("c") , "toolchain.sysincludedirs" } , binary = { - "config.linkdirs" + "target.runtimes" + , "config.linkdirs" , "config.frameworkdirs" , "target.linkdirs" , "target.frameworkdirs" @@ -68,7 +69,6 @@ language("c") , "target.strip" , "target.symbols" , "target.optimize:check" - , "target.runtimes" , "toolchain.linkdirs" , "toolchain.rpathdirs" , "toolchain.frameworkdirs" @@ -84,7 +84,8 @@ language("c") , "toolchain.syslinks" } , shared = { - "config.linkdirs" + "target.runtimes" + , "config.linkdirs" , "config.frameworkdirs" , "target.linkdirs" , "target.frameworkdirs" @@ -92,7 +93,6 @@ language("c") , "target.strip" , "target.symbols" , "target.optimize:check" - , "target.runtimes" , "toolchain.linkdirs" , "toolchain.rpathdirs" , "toolchain.frameworkdirs" diff --git a/xmake/languages/cuda/xmake.lua b/xmake/languages/cuda/xmake.lua index 119796003..c36f0bd2d 100644 --- a/xmake/languages/cuda/xmake.lua +++ b/xmake/languages/cuda/xmake.lua @@ -32,14 +32,14 @@ language("cuda") set_nameflags { object = { - "config.includedirs" + "target.runtimes" + , "config.includedirs" , "target.symbols" , "target.warnings" , "target.optimize:check" , "target.vectorexts:check" , "target.includedirs" , "target.languages" - , "target.runtimes" , "target.defines" , "target.undefines" , "toolchain.includedirs" @@ -49,7 +49,8 @@ language("cuda") , "toolchain.sysincludedirs" } , binary = { - "config.linkdirs" + "target.runtimes" + , "config.linkdirs" , "target.linkdirs" , "target.rpathdirs" , "target.strip" @@ -65,7 +66,8 @@ language("cuda") } , shared = { - "config.linkdirs" + "target.runtimes" + , "config.linkdirs" , "target.linkdirs" , "target.strip" , "target.symbols" diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua index 4c3b6ea14..808ae89c0 100644 --- a/xmake/languages/objc++/xmake.lua +++ b/xmake/languages/objc++/xmake.lua @@ -53,7 +53,8 @@ language("objc++") { object = { - "config.includedirs" + "target.runtimes" + , "config.includedirs" , "config.frameworkdirs" , "config.frameworks" , "target.symbols" @@ -81,7 +82,8 @@ language("objc++") } , binary = { - "config.linkdirs" + "target.runtimes" + , "config.linkdirs" , "config.frameworkdirs" , "target.linkdirs" , "target.rpathdirs" @@ -104,7 +106,8 @@ language("objc++") } , shared = { - "config.linkdirs" + "target.runtimes" + , "config.linkdirs" , "config.frameworkdirs" , "target.linkdirs" , "target.frameworkdirs" -- cgit v1.3.1 From a8c5e7e4e09282cac20964a21e3dcf95526d1e24 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 21 Apr 2025 09:40:18 +0800 Subject: Update xmake.lua --- xmake/languages/asm/xmake.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xmake/languages/asm/xmake.lua b/xmake/languages/asm/xmake.lua index 63f7eac4d..b73280355 100644 --- a/xmake/languages/asm/xmake.lua +++ b/xmake/languages/asm/xmake.lua @@ -31,8 +31,8 @@ language("asm") set_nameflags { object = { - "target.runtimes" - , "config.includedirs" + "config.includedirs" + , "target.runtimes" , "target.symbols" , "target.warnings" , "target.optimize:check" @@ -64,11 +64,11 @@ language("asm") , "toolchain.syslinks" } , shared = { - "config.linkdirs" + "target.runtimes" + , "config.linkdirs" , "target.linkdirs" , "target.strip" , "target.symbols" - , "target.runtimes" , "toolchain.linkdirs" , "config.links" , "target.links" -- cgit v1.3.1 From 1268f540f464d1fc2612088d8b6d145083ad36a3 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 21 Apr 2025 09:40:56 +0800 Subject: Update xmake.lua --- xmake/languages/c++/xmake.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua index 24115dbb7..cde570fa4 100644 --- a/xmake/languages/c++/xmake.lua +++ b/xmake/languages/c++/xmake.lua @@ -32,10 +32,10 @@ language("c++") set_nameflags { object = { - "target.runtimes" - , "config.includedirs" + "config.includedirs" , "config.frameworkdirs" , "config.frameworks" + , "target.runtimes" , "target.symbols" , "target.warnings" , "target.fpmodels" -- cgit v1.3.1 From fe2ff7bef55e65925c68fe504606f520014cdca5 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 21 Apr 2025 09:41:30 +0800 Subject: Update xmake.lua --- xmake/languages/c/xmake.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/languages/c/xmake.lua b/xmake/languages/c/xmake.lua index 8fb67b6b1..21fb308f0 100644 --- a/xmake/languages/c/xmake.lua +++ b/xmake/languages/c/xmake.lua @@ -32,10 +32,10 @@ language("c") set_nameflags { object = { - "target.runtimes" - , "config.includedirs" + "config.includedirs" , "config.frameworkdirs" , "config.frameworks" + , "target.runtimes" , "target.symbols" , "target.warnings" , "target.fpmodels" -- cgit v1.3.1 From 95033c7144409b7fbe26815dcd641836e5f4a718 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 21 Apr 2025 09:42:44 +0800 Subject: Update xmake.lua --- xmake/languages/cuda/xmake.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xmake/languages/cuda/xmake.lua b/xmake/languages/cuda/xmake.lua index c36f0bd2d..3f1989bff 100644 --- a/xmake/languages/cuda/xmake.lua +++ b/xmake/languages/cuda/xmake.lua @@ -32,8 +32,8 @@ language("cuda") set_nameflags { object = { - "target.runtimes" - , "config.includedirs" + "config.includedirs" + , "target.runtimes" , "target.symbols" , "target.warnings" , "target.optimize:check" @@ -64,8 +64,7 @@ language("cuda") , "target.syslinks" , "toolchain.syslinks" } - , shared = - { + , shared = { "target.runtimes" , "config.linkdirs" , "target.linkdirs" -- cgit v1.3.1 From 73ad382b342e927e231eeb3225fca25585bc4ff3 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 21 Apr 2025 09:43:35 +0800 Subject: Update xmake.lua --- xmake/languages/objc++/xmake.lua | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua index 808ae89c0..b6732351e 100644 --- a/xmake/languages/objc++/xmake.lua +++ b/xmake/languages/objc++/xmake.lua @@ -49,14 +49,12 @@ language("objc++") on_check_main("check_main") -- set name flags - set_nameflags - { - object = - { - "target.runtimes" - , "config.includedirs" + set_nameflags { + object = { + "config.includedirs" , "config.frameworkdirs" , "config.frameworks" + , "target.runtimes" , "target.symbols" , "target.warnings" , "target.optimize:check" @@ -80,8 +78,7 @@ language("objc++") , "target.sysincludedirs" , "toolchain.sysincludedirs" } - , binary = - { + , binary = { "target.runtimes" , "config.linkdirs" , "config.frameworkdirs" @@ -104,8 +101,7 @@ language("objc++") , "target.syslinks" , "toolchain.syslinks" } - , shared = - { + , shared = { "target.runtimes" , "config.linkdirs" , "config.frameworkdirs" @@ -126,8 +122,7 @@ language("objc++") , "target.syslinks" , "toolchain.syslinks" } - , static = - { + , static = { "target.strip" , "target.symbols" } -- cgit v1.3.1