Merge pull request !102 from taoxiangdong/mastertags/v1.1.0
| @@ -13,6 +13,7 @@ if (ENABLE_OPEN_SRC) | |||||
| set(HI_PYTHON python3.7) | set(HI_PYTHON python3.7) | ||||
| include(cmake/external_libs/protobuf_shared.cmake) | include(cmake/external_libs/protobuf_shared.cmake) | ||||
| include(cmake/external_libs/protobuf_static.cmake) | |||||
| include(cmake/external_libs/protoc.cmake) | include(cmake/external_libs/protoc.cmake) | ||||
| include(cmake/external_libs/gflags.cmake) | include(cmake/external_libs/gflags.cmake) | ||||
| include(cmake/external_libs/securec.cmake) | include(cmake/external_libs/securec.cmake) | ||||
| @@ -14,7 +14,7 @@ ExternalProject_Add(c_sec_build | |||||
| URL https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.10.tar.gz | URL https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.10.tar.gz | ||||
| #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz | #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz | ||||
| #SOURCE_DIR ${GE_CODE_DIR}/../libc_sec | #SOURCE_DIR ${GE_CODE_DIR}/../libc_sec | ||||
| PATCH_COMMAND patch -p1 < ${GE_CODE_DIR}/third_party/patch/securec/0001-add-securec-cmake-script.patch | |||||
| PATCH_COMMAND patch -p1 < ${METADEF_DIR}/third_party/patch/securec/0001-add-securec-cmake-script.patch | |||||
| CONFIGURE_COMMAND ${CMAKE_COMMAND} | CONFIGURE_COMMAND ${CMAKE_COMMAND} | ||||
| -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | ||||
| -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} | -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} | ||||
| @@ -719,6 +719,8 @@ target_compile_options(opensrc_ascendcl PRIVATE | |||||
| ) | ) | ||||
| target_link_options(opensrc_ascendcl PRIVATE | target_link_options(opensrc_ascendcl PRIVATE | ||||
| -rdynamic | -rdynamic | ||||
| -Wl,--allow-multiple-definition | |||||
| -Wl,-z,muldefs | |||||
| -Wl,-Bsymbolic | -Wl,-Bsymbolic | ||||
| -Wl,--exclude-libs,ALL | -Wl,--exclude-libs,ALL | ||||
| ) | ) | ||||