Skip to content

Commit

Permalink
Revert "Migrate hardcoded make to ${CMAKE_MAKE_PROGRAM}"
Browse files Browse the repository at this point in the history
This reverts commit 085666b.

Even though the change in this commit is wanted, either RetDec
or Yara can't work with CMAKE_MAKE_PROGRAM when it is set to ninja
properly.

This commit is reverting the state to the previous working state
until it is fixed.
  • Loading branch information
Peter Kubov committed Jan 17, 2022
1 parent f4f3021 commit a1d7a57
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions deps/yara/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ if(MSVC)
set(YARAC_PATH ${YARA_WIN_DIR}/${MSVC_CONFIG}/${YARAC_NAME})
else()
set(YARA_LIBRARY_DIR ${YARA_DIR}/libyara/.libs)
set(YARA_CLEAN_COMMAND ${CMAKE_MAKE_PROGRAM} clean)
set(YARA_BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} -j${CPUS})
set(YARA_CLEAN_COMMAND make clean)
set(YARA_BUILD_COMMAND make -j${CPUS})
set(YARAC_PATH ${YARA_DIR}/yarac)
endif()

Expand Down

0 comments on commit a1d7a57

Please sign in to comment.