Merge pull request #6337 from Arthapz/fix-link-runtimes

(runtimes) runtimes flags should be first to avoid -L/usr/lib make li…

5 files changed, 31 insertions, 32 deletions

diff --git a/xmake/languages/asm/xmake.lua b/xmake/languages/asm/xmake.lua
index 66115f65b..b73280355 100644
--- a/xmake/languages/asm/xmake.lua
+++ b/xmake/languages/asm/xmake.lua
@@ -32,6 +32,7 @@ language("asm")
     set_nameflags {
         object = {
             "config.includedirs"
+        ,   "target.runtimes"
         ,   "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"
@@ -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"
diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua
index 5e3121db7..cde570fa4 100644
--- a/xmake/languages/c++/xmake.lua
+++ b/xmake/languages/c++/xmake.lua
@@ -35,13 +35,13 @@ language("c++")
             "config.includedirs"
         ,   "config.frameworkdirs"
         ,   "config.frameworks"
+        ,   "target.runtimes"
         ,   "target.symbols"
         ,   "target.warnings"
         ,   "target.fpmodels"
         ,   "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..21fb308f0 100644
--- a/xmake/languages/c/xmake.lua
+++ b/xmake/languages/c/xmake.lua
@@ -35,13 +35,13 @@ language("c")
             "config.includedirs"
         ,   "config.frameworkdirs"
         ,   "config.frameworks"
+        ,   "target.runtimes"
         ,   "target.symbols"
         ,   "target.warnings"
         ,   "target.fpmodels"
         ,   "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..3f1989bff 100644
--- a/xmake/languages/cuda/xmake.lua
+++ b/xmake/languages/cuda/xmake.lua
@@ -33,13 +33,13 @@ language("cuda")
     set_nameflags {
         object = {
             "config.includedirs"
+        ,   "target.runtimes"
         ,   "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"
@@ -63,9 +64,9 @@ language("cuda")
         ,   "target.syslinks"
         ,   "toolchain.syslinks"
         }
-    ,   shared =
-        {
-            "config.linkdirs"
+    ,   shared = {
+            "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..b6732351e 100644
--- a/xmake/languages/objc++/xmake.lua
+++ b/xmake/languages/objc++/xmake.lua
@@ -49,13 +49,12 @@ language("objc++")
     on_check_main("check_main")
 
     -- set name flags
-    set_nameflags
-    {
-        object =
-        {
+    set_nameflags {
+        object = {
             "config.includedirs"
         ,   "config.frameworkdirs"
         ,   "config.frameworks"
+        ,   "target.runtimes"
         ,   "target.symbols"
         ,   "target.warnings"
         ,   "target.optimize:check"
@@ -79,9 +78,9 @@ language("objc++")
         ,   "target.sysincludedirs"
         ,   "toolchain.sysincludedirs"
         }
-    ,   binary =
-        {
-            "config.linkdirs"
+    ,   binary = {
+            "target.runtimes"
+        ,   "config.linkdirs"
         ,   "config.frameworkdirs"
         ,   "target.linkdirs"
         ,   "target.rpathdirs"
@@ -102,9 +101,9 @@ language("objc++")
         ,   "target.syslinks"
         ,   "toolchain.syslinks"
         }
-    ,   shared =
-        {
-            "config.linkdirs"
+    ,   shared = {
+            "target.runtimes"
+        ,   "config.linkdirs"
         ,   "config.frameworkdirs"
         ,   "target.linkdirs"
         ,   "target.frameworkdirs"
@@ -123,8 +122,7 @@ language("objc++")
         ,   "target.syslinks"
         ,   "toolchain.syslinks"
         }
-    ,   static =
-        {
+    ,   static = {
             "target.strip"
         ,   "target.symbols"
         }