diff --git a/deps/openssl/CMakeLists.txt b/deps/openssl/CMakeLists.txt index d2d4144de..599265847 100644 --- a/deps/openssl/CMakeLists.txt +++ b/deps/openssl/CMakeLists.txt @@ -94,7 +94,12 @@ elseif(OS_LINUX) set(OPENSSL_CONFIGURE_ARCH "linux-generic64") endif() elseif(OS_DARWIN) - set(OPENSSL_MAKE make -j${CPUS}) + execute_process( + COMMAND xcrun --show-sdk-path + OUTPUT_VARIABLE MACOS_SDK_PATH + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + set(OPENSSL_MAKE make SDKROOT=${MACOS_SDK_PATH} -j${CPUS}) if(ARCH_X86) set(OPENSSL_CONFIGURE_ARCH "darwin-i386-cc") elseif(ARCH_X64) diff --git a/deps/yara/CMakeLists.txt b/deps/yara/CMakeLists.txt index 6c69c6976..dca006472 100644 --- a/deps/yara/CMakeLists.txt +++ b/deps/yara/CMakeLists.txt @@ -39,6 +39,16 @@ else() set(YARAC_PATH ${YARA_DIR}/yarac) endif() +# https://github.com/avast/retdec/issues/439 +if(APPLE) + execute_process( + COMMAND xcrun --show-sdk-path + OUTPUT_VARIABLE MACOS_SDK_PATH + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${MACOS_SDK_PATH}") +endif() + # These are not used on MSVC, but we use it on all platforms to detect if # build configuration changed - changes in config should be mirrored on both # MSVC & Linux. @@ -101,16 +111,6 @@ else() ) endif() -# https://github.com/avast/retdec/issues/439 -if(APPLE) - execute_process( - COMMAND xcrun --show-sdk-path - OUTPUT_VARIABLE MACOS_SDK_PATH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${MACOS_SDK_PATH}") -endif() - if(NOT MSVC) ExternalProject_Add_Step(yara configure-linux WORKING_DIRECTORY ${YARA_DIR} diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index 4e6b9d485..0fa8d5594 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -53,7 +53,7 @@ does not match the current version '\${YARAC_CURRENT_VERSION}' \ install(CODE " execute_process( # -u = unbuffered -> print debug messages right away. - COMMAND \"${PYTHON_EXECUTABLE}\" -u \"${CMAKE_SOURCE_DIR}/support/install-share.py\" \"${CMAKE_INSTALL_PREFIX}\" \"${SUPPORT_PKG_URL}\" \"${SUPPORT_PKG_SHA256}\" \"${SUPPORT_PKG_VERSION}\" + COMMAND \"${PYTHON_EXECUTABLE}\" -u \"${PROJECT_SOURCE_DIR}/support/install-share.py\" \"${CMAKE_INSTALL_PREFIX}\" \"${SUPPORT_PKG_URL}\" \"${SUPPORT_PKG_SHA256}\" \"${SUPPORT_PKG_VERSION}\" RESULT_VARIABLE INSTALL_SHARE_RES ) if(INSTALL_SHARE_RES) @@ -91,14 +91,14 @@ install( # Install YARA rules for tools detection. # -set(YARA_INSTALL_PY "${CMAKE_SOURCE_DIR}/support/install-yara.py") +set(YARA_INSTALL_PY "${PROJECT_SOURCE_DIR}/support/install-yara.py") install(CODE " execute_process( COMMAND \"${PYTHON_EXECUTABLE}\" -u \"${YARA_INSTALL_PY}\" \"${YARAC_PATH}\" \"${SUPPORT_TARGET_DIR}\" - \"${CMAKE_SOURCE_DIR}/support/yara_patterns\" + \"${PROJECT_SOURCE_DIR}/support/yara_patterns\" ${RETDEC_COMPILE_YARA} RESULT_VARIABLE INSTALL_YARA_RES )