Skip to content

Commit 33b30ad

Browse files
committed
Build custom jemalloc with -j$(nproc)
Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 6b0b6ae commit 33b30ad

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

CMakeLists.txt

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,13 @@ else()
161161
WORKING_DIRECTORY ${jemalloc_targ_SOURCE_DIR}
162162
OUTPUT ${jemalloc_targ_SOURCE_DIR}/Makefile
163163
DEPENDS ${jemalloc_targ_SOURCE_DIR}/configure)
164+
165+
if(NOT UMF_QEMU_BUILD)
166+
set(MAKE_ARGUMENTS "-j$(nproc)")
167+
endif()
168+
164169
add_custom_command(
165-
COMMAND make
170+
COMMAND make ${MAKE_ARGUMENTS}
166171
WORKING_DIRECTORY ${jemalloc_targ_SOURCE_DIR}
167172
OUTPUT ${jemalloc_targ_SOURCE_DIR}/lib/libjemalloc.a
168173
DEPENDS ${jemalloc_targ_SOURCE_DIR}/Makefile)
@@ -720,21 +725,21 @@ if(UMF_FORMAT_CODE_STYLE)
720725
AND BLACK)
721726
add_custom_target(
722727
format-check
723-
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
728+
COMMAND ${CMAKE_ARGUMENTS} --build ${CMAKE_BINARY_DIR} --target
724729
clang-format-check
725-
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
730+
COMMAND ${CMAKE_ARGUMENTS} --build ${CMAKE_BINARY_DIR} --target
726731
cmake-format-check
727-
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
732+
COMMAND ${CMAKE_ARGUMENTS} --build ${CMAKE_BINARY_DIR} --target
728733
black-format-check
729734
COMMENT "Running all formatting checks")
730735

731736
add_custom_target(
732737
format-apply
733-
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
738+
COMMAND ${CMAKE_ARGUMENTS} --build ${CMAKE_BINARY_DIR} --target
734739
clang-format-apply
735-
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
740+
COMMAND ${CMAKE_ARGUMENTS} --build ${CMAKE_BINARY_DIR} --target
736741
cmake-format-apply
737-
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
742+
COMMAND ${CMAKE_ARGUMENTS} --build ${CMAKE_BINARY_DIR} --target
738743
black-format-apply
739744
COMMENT "Format C/C++, CMake, and Python files")
740745
message(
@@ -797,5 +802,5 @@ install(FILES ${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}-config.cmake
797802
configure_file("${PROJECT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
798803
"${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
799804

800-
add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
805+
add_custom_target(uninstall COMMAND ${CMAKE_ARGUMENTS} -P
801806
${PROJECT_BINARY_DIR}/cmake_uninstall.cmake)

scripts/qemu/run-build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ cd build
2121

2222
cmake .. \
2323
-DCMAKE_BUILD_TYPE=Debug \
24+
-DUMF_QEMU_BUILD=1 \
2425
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON \
2526
-DUMF_BUILD_CUDA_PROVIDER=ON \
2627
-DUMF_FORMAT_CODE_STYLE=OFF \

0 commit comments

Comments
 (0)