[Cherry-pick][X86][Demo][MAC] Fix the issue that python demo and cxx_demo failed on MAC env (#3618)

docs/user_guides/Compile/Android.md

@@ -65,7 +65,7 @@ inference_lite_lib.android.armv8/
 ```shell
 --arch: (armv8|armv7)        arm版本，默认为armv8
 --toolchain: (gcc|clang)     编译器类型，默认为gcc
---android_stl: (c++_static|c++_shared|gnu_static|gnu_shared)   NDK stl库链接方法，默认为静态链接c++_static
+--android_stl: (c++_static|c++_shared|gnustl_static)   NDK stl库链接方法，默认为静态链接c++_static
 --with_java: (OFF|ON)        是否编译Java预测库, 默认为 ON
 --with_cv: (OFF|ON)          是否编译CV相关预处理库, 默认为 OFF
 --with_log: (OFF|ON)         是否输出日志信息, 默认为 ON

lite/core/mir/fusion/fc_fuse_pass.cc

@@ -38,7 +38,7 @@ void FcFusePass::Apply(const std::unique_ptr<SSAGraph>& graph) {
 
 REGISTER_MIR_PASS(lite_fc_fuse_pass, paddle::lite::mir::FcFusePass)
     .BindTargets({TARGET(kAny)})
-    .ExcludeTargets({TARGET(kXPU)})
+    .ExcludeTargets({TARGET(kXPU), TARGET(kX86)})
     .ExcludeTargets({TARGET(kBM)})
     .ExcludeTargets({TARGET(kCUDA)})
     .BindKernel("fc");

lite/demo/cxx/x86_mobilenetv1_full_demo/CMakeLists.txt

@@ -17,5 +17,5 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
 # 4.add executable output
 add_executable(${TARGET} ${TARGET}.cc)
 target_link_libraries(${TARGET} -lpaddle_full_api_shared)
-target_link_libraries(${TARGET} -lmklml_intel)
+target_link_libraries(${TARGET} -liomp5)
 target_link_libraries(${TARGET} -ldl)

lite/demo/cxx/x86_mobilenetv1_light_demo/CMakeLists.txt

@@ -17,5 +17,5 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
 # 4.add executable output
 add_executable(${TARGET} ${TARGET}.cc)
 target_link_libraries(${TARGET} -lpaddle_light_api_shared)
-target_link_libraries(${TARGET} -lmklml_intel)
+target_link_libraries(${TARGET} -liomp5)
 target_link_libraries(${TARGET} -ldl)

lite/tools/build_android.sh

@@ -233,7 +233,7 @@ function print_usage {
     echo -e "|  optional argument:                                                                                                                  |"
     echo -e "|     --arch: (armv8|armv7), default is armv8                                                                                          |"
     echo -e "|     --toolchain: (gcc|clang), defalut is gcc                                                                                         |"
-    echo -e "|     --android_stl: (c++_static|c++_shared|gnu_static|gnu_shared), default is c++_static                                              |"
+    echo -e "|     --android_stl: (c++_static|c++_shared|gnustl_static), default is c++_static                                                      |"
     echo -e "|     --with_java: (OFF|ON); controls whether to publish java api lib, default is ON                                                   |"
     echo -e "|     --with_cv: (OFF|ON); controls whether to compile cv functions into lib, default is OFF                                           |"
     echo -e "|     --with_log: (OFF|ON); controls whether to print log information, default is ON                                                   |"