diff options
| -rw-r--r-- | eclass/cmake-multilib.eclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass index 65f314a..8e417c3 100644 --- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.eclass @@ -114,8 +114,11 @@ _cmake-multilib_abi_postproc() { multilib_src_configure() { debug-print-function "${FUNCNAME}" "$(mg-qm "$@")" - [[ ${CMAKE_MULTILIB_IN_SOURCE_BUILD} ]] && local ECONF_SOURCE=${BUILD_DIR} + if [[ ${CMAKE_MULTILIB_IN_SOURCE_BUILD} ]]; then + local ECONF_SOURCE=${BUILD_DIR} + local CMAKE_USE_DIR=${BUILD_DIR} + fi ehook cmake-utils-pre_src_configure _cmake-multilib-cmake-utils-pre_src_configure_wrapper ehook cmake-utils-post_src_configure _cmake-multilib-cmake-utils-post_src_configure_wrapper _cmake-multilib_localize_vars cmake-utils_src_configure "${_cm_args[@]}" @@ -135,6 +138,7 @@ cmake-multilib_src_configure() { multilib_src_compile() { debug-print-function "${FUNCNAME}" "$(mg-qm "$@")" + [[ ${CMAKE_MULTILIB_IN_SOURCE_BUILD} ]] && local CMAKE_USE_DIR=${BUILD_DIR} ehook cmake-utils-pre_src_compile _cmake-multilib-cmake-utils-pre_src_compile_wrapper ehook cmake-utils-post_src_compile _cmake-multilib-cmake-utils-post_src_compile_wrapper _cmake-multilib_localize_vars cmake-utils_src_compile "${_cm_args[@]}" @@ -154,6 +158,7 @@ cmake-multilib_src_compile() { multilib_src_test() { debug-print-function "${FUNCNAME}" "$(mg-qm "$@")" + [[ ${CMAKE_MULTILIB_IN_SOURCE_BUILD} ]] && local CMAKE_USE_DIR=${BUILD_DIR} ehook cmake-utils-pre_src_test _cmake-multilib-cmake-utils-pre_src_test_wrapper ehook cmake-utils-post_src_test _cmake-multilib-cmake-utils-post_src_test_wrapper _cmake-multilib_localize_vars cmake-utils_src_test "${_cm_args[@]}" @@ -173,6 +178,7 @@ cmake-multilib_src_test() { multilib_src_install() { debug-print-function "${FUNCNAME}" "$(mg-qm "$@")" + [[ ${CMAKE_MULTILIB_IN_SOURCE_BUILD} ]] && local CMAKE_USE_DIR=${BUILD_DIR} # override some variables that cmake-utils might attempt to process, but # for which we have alternate processing in multilib_src_install_all. This # prevents pointless repeat-installation of nongenerated documentation. |