Merge pull request #3901 from xmake-io/link

support lib path for add_links #3889
xmake-io · Jun 29, 2023 · efe0cbf · efe0cbf
2 parents 8a411ae + 0898fd2
commit efe0cbf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua
@@ -276,7 +276,11 @@ end
 
 -- make the link flag
 function nf_link(self, lib)
-    return "-l" .. lib
+    if lib:endswith(".a") or lib:endswith(".so") or lib:endswith(".dylib") or lib:endswith(".lib") then
+        return lib
+    else
+        return "-l" .. lib
+    end
 end
 
 -- make the syslink flag

diff --git a/xmake/modules/core/tools/link.lua b/xmake/modules/core/tools/link.lua
@@ -100,7 +100,10 @@ end
 
 -- make the link flag
 function nf_link(self, lib)
-    return lib .. ".lib"
+    if not lib:endswith(".lib") then
+        lib = lib .. ".lib"
+    end
+    return lib
 end
 
 -- make the syslink flag

diff --git a/xmake/modules/core/tools/nvcc.lua b/xmake/modules/core/tools/nvcc.lua
@@ -229,7 +229,11 @@ end
 
 -- make the link flag
 function nf_link(self, lib)
-    return "-l" .. lib
+    if lib:endswith(".a") or lib:endswith(".so") or lib:endswith(".dylib") or lib:endswith(".lib") then
+        return lib
+    else
+        return "-l" .. lib
+    end
 end
 
 -- make the syslink flag