зеркало из https://github.com/microsoft/CCF.git
Remove GCC-specific code, since we do not support GCC at the moment (#350)
This commit is contained in:
Родитель
8b83e8f1eb
Коммит
502891e559
|
@ -21,19 +21,8 @@ else()
|
|||
set(PYTHON unbuffer python3)
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
add_compile_options(/W3 /std:c++latest)
|
||||
else()
|
||||
# GCC requires libatomic as well as libpthread.
|
||||
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
set(${CMAKE_THREAD_LIBS_INIT} "$CMAKE_THREAD_LIBS_INIT} atomic")
|
||||
separate_arguments(COVERAGE_FLAGS UNIX_COMMAND "--coverage -fprofile-arcs -ftest-coverage")
|
||||
separate_arguments(COVERAGE_LINK UNIX_COMMAND "gcov")
|
||||
else()
|
||||
separate_arguments(COVERAGE_FLAGS UNIX_COMMAND "-fprofile-instr-generate -fcoverage-mapping")
|
||||
separate_arguments(COVERAGE_LINK UNIX_COMMAND "-fprofile-instr-generate -fcoverage-mapping")
|
||||
endif()
|
||||
endif()
|
||||
separate_arguments(COVERAGE_FLAGS UNIX_COMMAND "-fprofile-instr-generate -fcoverage-mapping")
|
||||
separate_arguments(COVERAGE_LINK UNIX_COMMAND "-fprofile-instr-generate -fcoverage-mapping")
|
||||
|
||||
function(enable_coverage name)
|
||||
if (COVERAGE)
|
||||
|
@ -55,12 +44,10 @@ else ()
|
|||
message(FATAL_ERROR "Unsupported curve choice ${SERVICE_IDENTITY_CURVE_CHOICE}")
|
||||
endif ()
|
||||
|
||||
option (COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." TRUE)
|
||||
option (COLORED_OUTPUT "Always produce ANSI-colored output (Clang only)." TRUE)
|
||||
|
||||
if (${COLORED_OUTPUT})
|
||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
add_compile_options (-fdiagnostics-color=always)
|
||||
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
add_compile_options (-fcolor-diagnostics)
|
||||
endif ()
|
||||
endif ()
|
||||
|
@ -419,7 +406,6 @@ function(add_enclave_lib name app_oe_conf_path enclave_sign_key_path)
|
|||
-nostdlib -nodefaultlibs -nostartfiles
|
||||
-Wl,--no-undefined
|
||||
-Wl,-Bstatic,-Bsymbolic,--export-dynamic,-pie
|
||||
-lgcc
|
||||
${PARSED_ARGS_LINK_LIBS}
|
||||
${ENCLAVE_LIBS}
|
||||
)
|
||||
|
|
|
@ -54,7 +54,6 @@ if(NOT ${TARGET} STREQUAL "virtual")
|
|||
-nostdlib -nodefaultlibs -nostartfiles
|
||||
-Wl,--no-undefined
|
||||
-Wl,-Bstatic,-Bsymbolic,--export-dynamic,-pie
|
||||
-lgcc
|
||||
evercrypt.enclave
|
||||
)
|
||||
use_oe_mbedtls(ccfcrypto.enclave)
|
||||
|
|
Загрузка…
Ссылка в новой задаче