This is an archive of the discontinued LLVM Phabricator instance.

Differential D39445

[clang-fuzzer] Fix incremental builds of the fuzzer
ClosedPublic

Authored by vitalybuka on Oct 30 2017, 7:28 PM.

Details

Reviewers
kcc
morehouse
Commits
rG1efe7740ce7e: [clang-fuzzer] Fix incremental builds of the fuzzer
rC317035: [clang-fuzzer] Fix incremental builds of the fuzzer
rL317035: [clang-fuzzer] Fix incremental builds of the fuzzer
Summary

Don't use BUILD_IN_SOURCE keep git checkout clean
Don't forward CMAKE_GENERATOR as ExternalProject_Add should do it already
Reset UPDATE_COMMAND to avoid git checkout updates on each build

Diff Detail

Repository
rL LLVM

Event Timeline

vitalybuka created this revision.Oct 30 2017, 7:28 PM
Harbormaster completed remote builds in B11644: Diff 120926.Oct 30 2017, 7:28 PM
Herald added a subscriber: mgorny. · View Herald TranscriptOct 30 2017, 7:28 PM
morehouse accepted this revision.Oct 31 2017, 9:26 AM

LGTM.

This revision is now accepted and ready to land.Oct 31 2017, 9:26 AM
Closed by commit rL317035: [clang-fuzzer] Fix incremental builds of the fuzzer (authored by vitalybuka). · Explain WhyOct 31 2017, 1:50 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
cmake/
modules/
17 lines

Diff 121045

cfe/trunk/cmake/modules/ProtobufMutator.cmake

set(PBM_PREFIX protobuf_mutator) set(PBM_PREFIX protobuf_mutator)
set(PBM_PATH ${CMAKE_CURRENT_BINARY_DIR}/${PBM_PREFIX}/src/${PBM_PREFIX}) set(PBM_PATH ${CMAKE_CURRENT_BINARY_DIR}/${PBM_PREFIX}/src/${PBM_PREFIX})
set(PBM_LIB_PATH ${PBM_PATH}/src/libprotobuf-mutator.a) set(PBM_LIB_PATH ${PBM_PATH}-build/src/libprotobuf-mutator.a)
set(PBM_FUZZ_LIB_PATH ${PBM_PATH}/src/libfuzzer/libprotobuf-mutator-libfuzzer.a) set(PBM_FUZZ_LIB_PATH ${PBM_PATH}-build/src/libfuzzer/libprotobuf-mutator-libfuzzer.a)
ExternalProject_Add(${PBM_PREFIX} ExternalProject_Add(${PBM_PREFIX}
PREFIX ${PBM_PREFIX} PREFIX ${PBM_PREFIX}
GIT_REPOSITORY https://github.com/google/libprotobuf-mutator.git GIT_REPOSITORY https://github.com/google/libprotobuf-mutator.git
GIT_TAG master GIT_TAG master
CONFIGURE_COMMAND ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
BUILD_BYPRODUCTS ${PBM_LIB_PATH} ${PBM_FUZZ_LIB_PATH} BUILD_BYPRODUCTS ${PBM_LIB_PATH} ${PBM_FUZZ_LIB_PATH}
BUILD_IN_SOURCE 1 UPDATE_COMMAND ""
INSTALL_COMMAND "" INSTALL_COMMAND ""
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
LOG_BUILD 1
) )
set(ProtobufMutator_INCLUDE_DIRS ${PBM_PATH}) set(ProtobufMutator_INCLUDE_DIRS ${PBM_PATH})
set(ProtobufMutator_LIBRARIES ${PBM_FUZZ_LIB_PATH} ${PBM_LIB_PATH}) set(ProtobufMutator_LIBRARIES ${PBM_FUZZ_LIB_PATH} ${PBM_LIB_PATH})