Skip to content

Commit 1efe774

Browse files
committedOct 31, 2017
[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 Reviewers: kcc, morehouse Subscribers: cfe-commits, mgorny Differential Revision: https://reviews.llvm.org/D39445 llvm-svn: 317035
1 parent 58da33e commit 1efe774

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed
 

‎clang/cmake/modules/ProtobufMutator.cmake

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
set(PBM_PREFIX protobuf_mutator)
22
set(PBM_PATH ${CMAKE_CURRENT_BINARY_DIR}/${PBM_PREFIX}/src/${PBM_PREFIX})
3-
set(PBM_LIB_PATH ${PBM_PATH}/src/libprotobuf-mutator.a)
4-
set(PBM_FUZZ_LIB_PATH ${PBM_PATH}/src/libfuzzer/libprotobuf-mutator-libfuzzer.a)
3+
set(PBM_LIB_PATH ${PBM_PATH}-build/src/libprotobuf-mutator.a)
4+
set(PBM_FUZZ_LIB_PATH ${PBM_PATH}-build/src/libfuzzer/libprotobuf-mutator-libfuzzer.a)
55

66
ExternalProject_Add(${PBM_PREFIX}
77
PREFIX ${PBM_PREFIX}
88
GIT_REPOSITORY https://github.com/google/libprotobuf-mutator.git
99
GIT_TAG master
10-
CONFIGURE_COMMAND ${CMAKE_COMMAND} -G${CMAKE_GENERATOR}
11-
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
12-
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
13-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
14-
BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
10+
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
11+
CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
12+
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
1513
BUILD_BYPRODUCTS ${PBM_LIB_PATH} ${PBM_FUZZ_LIB_PATH}
16-
BUILD_IN_SOURCE 1
14+
UPDATE_COMMAND ""
1715
INSTALL_COMMAND ""
18-
LOG_DOWNLOAD 1
19-
LOG_CONFIGURE 1
20-
LOG_BUILD 1
2116
)
2217

2318
set(ProtobufMutator_INCLUDE_DIRS ${PBM_PATH})

0 commit comments

Comments
 (0)
Please sign in to comment.