Skip to content

Commit 7fba8bb

Browse files
committed
Merge pull request #10323
b94d504 makefile: fix parallel build (Navid Rahimi)
2 parents 602ed1f + b94d504 commit 7fba8bb

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ depends:
5252
5353
cmake-debug:
5454
mkdir -p $(builddir)/debug
55-
cd $(builddir)/debug && cmake -D CMAKE_BUILD_TYPE=Debug $(topdir)
55+
cd $(builddir)/debug && cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Debug $(topdir)
5656
5757
debug: cmake-debug
58-
cd $(builddir)/debug && cmake --build .
58+
cd $(builddir)/debug && $(MAKE)
5959
6060
# Temporarily disable some tests:
6161
# * libwallet_api_tests fail (Issue #895)
@@ -77,10 +77,10 @@ debug-all:
7777
7878
cmake-release:
7979
mkdir -p $(builddir)/release
80-
cd $(builddir)/release && cmake -D CMAKE_BUILD_TYPE=Release $(topdir)
80+
cd $(builddir)/release && cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Release $(topdir)
8181
8282
release: cmake-release
83-
cd $(builddir)/release && cmake --build .
83+
cd $(builddir)/release && $(MAKE)
8484
8585
release-test:
8686
mkdir -p $(builddir)/release
@@ -92,7 +92,7 @@ release-all:
9292
9393
release-static:
9494
mkdir -p $(builddir)/release
95-
cd $(builddir)/release && cmake -D STATIC=ON -D ARCH="default" -D CMAKE_BUILD_TYPE=Release $(topdir) && cmake --build .
95+
cd $(builddir)/release && cmake -G "Unix Makefiles" -D STATIC=ON -D ARCH="default" -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
9696
9797
coverage:
9898
mkdir -p $(builddir)/debug

0 commit comments

Comments
 (0)