CMake: move symbol prefixing check to the run_tests stage. Bug: 543471701 Change-Id: Ib36d1ee3549b8bc832b221e44694124e6a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/100552 Presubmit-BoringSSL-Verified: boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Xiangfei Ding <xfding@google.com> Commit-Queue: Rudolf Polzer <rpolzer@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt index 87e554c..31b4cc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -845,12 +845,33 @@ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS run_unit_tests bssl_shim handshaker USES_TERMINAL) + if(BORINGSSL_PREFIX) + add_custom_target( + check_prefixed_symbols + COMMENT "Checking symbol prefixing" + COMMAND ${GO_EXECUTABLE} + run ${CMAKE_CURRENT_SOURCE_DIR}/util/audit_symbols.go + -ignore-symbols-with ${BORINGSSL_PREFIX} + $<TARGET_FILE:crypto> + USES_TERMINAL + ) + add_dependencies(run_tests check_prefixed_symbols) + else() + add_custom_target( + check_prefixed_symbols + COMMAND ${CMAKE_COMMAND} -E echo "Symbol prefixing not enabled" + COMMAND ${CMAKE_COMMAND} -E false) + endif() else() add_custom_target( run_unit_tests COMMAND ${CMAKE_COMMAND} -E echo "Running tests requires Go" COMMAND ${CMAKE_COMMAND} -E false) add_custom_target( + check_prefixed_symbols + COMMAND ${CMAKE_COMMAND} -E echo "Running tests requires Go" + COMMAND ${CMAKE_COMMAND} -E false) + add_custom_target( run_tests COMMAND ${CMAKE_COMMAND} -E echo "Running tests requires Go" COMMAND ${CMAKE_COMMAND} -E false) @@ -858,20 +879,6 @@ endif() endif() -if(BORINGSSL_PREFIX) - require_go() - add_custom_target( - verify_boringssl_prefix ALL - COMMENT "Verifying symbol prefixing" - COMMAND ${GO_EXECUTABLE} - run ${CMAKE_CURRENT_SOURCE_DIR}/util/audit_symbols.go - -ignore-symbols-with ${BORINGSSL_PREFIX} - $<TARGET_FILE:crypto> - DEPENDS crypto - USES_TERMINAL - ) -endif() - if(INSTALL_ENABLED) install(TARGETS crypto ssl EXPORT OpenSSLTargets) install(TARGETS bssl)