Skip to content

Commit

Permalink
Build: Minor bug fixes
Browse files Browse the repository at this point in the history
* make should always be called as $(MAKE) in makefiles
* CMake didn't keep job server fds open when explicilty specifying the
  build command. Starting with CMAKE 3.28 there is a new option to allow
  for that, but we support much older cmakes than that.
  (BUILD_JOB_SERVER_AWARE). Not sure when this broke in practice, might
  have been with some update of Make/CMake or wally. (concurrent builds
  (-j8) doesn't work right now)
  • Loading branch information
NickeZ committed Feb 4, 2025
1 parent 821a48f commit 78ab523
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ generate-atecc608-config:
ci:
./.ci/ci
prepare-tidy: | build build-build
make -C build rust-cbindgen
make -C build-build rust-cbindgen
$(MAKE) -C build rust-cbindgen
$(MAKE) -C build-build rust-cbindgen
clean:
rm -rf build build-build build-debug build-build-rust-unit-tests
1 change: 0 additions & 1 deletion external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ ExternalProject_Add(libwally-core
${CMAKE_CURRENT_SOURCE_DIR}/libwally-core/configure
${CONFIGURE_FLAGS}
${LIBWALLY_CONFIGURE_FLAGS}
BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_BINARY_DIR}/libwally-core/src/libwally-core-build/src/.libs/libwallycore.a
Expand Down

0 comments on commit 78ab523

Please sign in to comment.