(runtimes) runtimes flags should be first to avoid -L/usr/lib make linker choose wrong libraries

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"