From 246d8af764f10d947b59e22deb67be99d0f91157 Mon Sep 17 00:00:00 2001
From: Arthur LAURENT <arthur.laurent4@gmail.com>
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/objc++/xmake.lua | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'xmake/languages/objc++/xmake.lua')

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 73ad382b342e927e231eeb3225fca25585bc4ff3 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
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(-)

(limited to 'xmake/languages/objc++/xmake.lua')

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