瀏覽代碼

fix libomp (#748)

Hoildkv 3 年之前
父節點
當前提交
aaa5d5d87a
共有 1 個文件被更改,包括 3 次插入24 次删除
  1. 3 24
      packages/l/libomp/xmake.lua

+ 3 - 24
packages/l/libomp/xmake.lua

@@ -11,33 +11,12 @@ package("libomp")
     add_deps("cmake")
     add_deps("cmake")
 
 
     add_links("omp")
     add_links("omp")
-    if is_plat("linux") then
+    if is_plat("macosx") then
+        add_extsources("brew::libomp")
+    elseif is_plat("linux") then
         add_syslinks("pthread", "dl")
         add_syslinks("pthread", "dl")
     end
     end
 
 
-    on_load(function (package)
-        if package.has_tool then
-            for _, toolkind in ipairs({"cc", "cxx"}) do
-                local flagname = toolkind == "cxx" and "cxxflags" or "cflags"
-                if package:has_tool(toolkind, "cl") then
-                    package:add(flagname, "/openmp")
-                elseif package:has_tool(toolkind, "clang", "clangxx") then
-                    if package:is_plat("macosx") then
-                        package:add(flagname, "-Xpreprocessor -fopenmp")
-                    else
-                        package:add(flagname, "-fopenmp")
-                    end
-                elseif package:has_tool(toolkind, "gcc", "gxx") then
-                    package:add(flagname, "-fopenmp")
-                elseif package:has_tool(toolkind, "icc", "icpc") then
-                    package:add(flagname, "-qopenmp")
-                elseif package:has_tool(toolkind, "icl") then
-                    package:add(flagname, "-Qopenmp")
-                end
-            end
-        end
-    end)
-
     on_install("macosx", "linux", "cross", function (package)
     on_install("macosx", "linux", "cross", function (package)
         local configs = {"-DLIBOMP_INSTALL_ALIASES=OFF"}
         local configs = {"-DLIBOMP_INSTALL_ALIASES=OFF"}
         local shared = package:config("shared")
         local shared = package:config("shared")