Merge branch 'static_link_omp_to_libmace.so' into 'master'

static link omp into libmace.so See merge request !720

Merge branch 'static_link_omp_to_libmace.so' into 'master'
static link omp into libmace.so See merge request !720
18cf283f · 李寅 · 5710e941 · 387d2334 · 18cf283f · 18cf283f
隐藏空白更改
内联并排

Showing with 4 addition and 4 deletion

mace/examples/cli/BUILD mace/examples/cli/BUILD +1 -3

mace/libmace/BUILD mace/libmace/BUILD +3 -1

未找到文件。
--- a/mace/examples/cli/BUILD
+++ b/mace/examples/cli/BUILD
@@ -47,9 +47,7 @@ cc_binary(
    ]),
    linkopts = [
        "-lm",
-    ] + if_openmp_enabled([
+    ] + if_android([
-        "-fopenmp"
-    ]) + if_android([
        "-ldl",
        "-pie",
        "-llog",

--- a/mace/libmace/BUILD
+++ b/mace/libmace/BUILD
@@ -50,7 +50,9 @@ cc_binary(
        "-Wl,-soname,libmace.so",
        "-Wl,--version-script",
        "mace_version_script.lds",
-    ],
+    ] + if_openmp_enabled([
+        "-fopenmp",
+    ]),
    linkshared = 1,
    linkstatic = 1,
    deps = [