diff options
| author | Kuba Mracek <mracek@apple.com> | 2017-04-19 23:44:33 +0000 |
|---|---|---|
| committer | Kuba Mracek <mracek@apple.com> | 2017-04-19 23:44:33 +0000 |
| commit | 7fe92fc521400cddc7aac2236dc62d22c0f9b1eb (patch) | |
| tree | 8d7cac42d851af272f9106e219da81d3fe2054b0 | |
| parent | c12cee36004590e735fad8d59203ed1a37b72349 (diff) | |
| download | bcm5719-llvm-7fe92fc521400cddc7aac2236dc62d22c0f9b1eb.tar.gz bcm5719-llvm-7fe92fc521400cddc7aac2236dc62d22c0f9b1eb.zip | |
Revert r300789: There are Windows bot failures.
llvm-svn: 300794
| -rw-r--r-- | llvm/lib/Fuzzer/CMakeLists.txt | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/llvm/lib/Fuzzer/CMakeLists.txt b/llvm/lib/Fuzzer/CMakeLists.txt index cc7c8a81211..59cef04cdec 100644 --- a/llvm/lib/Fuzzer/CMakeLists.txt +++ b/llvm/lib/Fuzzer/CMakeLists.txt @@ -1,11 +1,14 @@ +set(LIBFUZZER_FLAGS_BASE "${CMAKE_CXX_FLAGS}") +# Disable the coverage and sanitizer instrumentation for the fuzzer itself. +set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fno-sanitize-coverage=trace-pc-guard,edge,trace-cmp,indirect-calls,8bit-counters -Werror") if( LLVM_USE_SANITIZE_COVERAGE ) - set(LIBFUZZER_FLAGS_BASE "${CMAKE_CXX_FLAGS}") - - # Disable the coverage and sanitizer instrumentation for the fuzzer itself. - set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fno-sanitize-coverage=trace-pc-guard,edge,trace-cmp,indirect-calls,8bit-counters -Werror") -endif() - -add_library(LLVMFuzzerNoMainObjects OBJECT + if(NOT "${LLVM_USE_SANITIZER}" STREQUAL "Address") + message(FATAL_ERROR + "LibFuzzer and its tests require LLVM_USE_SANITIZER=Address and " + "LLVM_USE_SANITIZE_COVERAGE=YES to be set." + ) + endif() + add_library(LLVMFuzzerNoMainObjects OBJECT FuzzerCrossOver.cpp FuzzerDriver.cpp FuzzerExtFunctionsDlsym.cpp @@ -29,24 +32,15 @@ add_library(LLVMFuzzerNoMainObjects OBJECT FuzzerUtilPosix.cpp FuzzerUtilWindows.cpp ) -add_library(LLVMFuzzerNoMain STATIC + add_library(LLVMFuzzerNoMain STATIC $<TARGET_OBJECTS:LLVMFuzzerNoMainObjects> ) -target_link_libraries(LLVMFuzzerNoMain ${LLVM_PTHREAD_LIB}) -add_library(LLVMFuzzer STATIC + target_link_libraries(LLVMFuzzerNoMain ${LLVM_PTHREAD_LIB}) + add_library(LLVMFuzzer STATIC FuzzerMain.cpp $<TARGET_OBJECTS:LLVMFuzzerNoMainObjects> ) -target_link_libraries(LLVMFuzzer ${LLVM_PTHREAD_LIB}) - -if( LLVM_USE_SANITIZE_COVERAGE ) - - if(NOT "${LLVM_USE_SANITIZER}" STREQUAL "Address") - message(FATAL_ERROR - "LibFuzzer tests require LLVM_USE_SANITIZER=Address and " - "LLVM_USE_SANITIZE_COVERAGE=YES to be set." - ) - endif() + target_link_libraries(LLVMFuzzer ${LLVM_PTHREAD_LIB}) if( LLVM_INCLUDE_TESTS ) add_subdirectory(test) |
