Skip to content

Commit ac46a18

Browse files
LebedevRILebedevRI
committed
deps: deps: consistently use cmake --build whenever dep uses CMake
This was previously attempted in JuliaLang#54538, but reverted in JuliaLang#55285 because of JuliaLang#55284: ``` After 8fd5aeb, building LLVM on CI as part of JuliaCI/julia-buildkite#345 just seems to hang until a cancellation signal at which points it starts building again. See https://buildkite.com/julialang/julia-buildkite/builds/1608#0190f950-0eb6-4fe3-938b-af69d186c40a for an example log with -d passed to make. ``` Bad iteraction with Make jobserver is suspected, Maybe the issue has since fixed itself? See JuliaLang#58284
1 parent 748775b commit ac46a18

File tree

9 files changed

+23
-31
lines changed

9 files changed

+23
-31
lines changed

‎deps/BOLT.mk‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,13 @@ $(BOLT_BUILDDIR)/build-configured: $(SRCCACHE)/$(BOLT_SRC_DIR)/source-extracted
8080

8181
$(BOLT_BUILDDIR)/build-compiled: $(BOLT_BUILDDIR)/build-configured
8282
cd $(BOLT_BUILDDIR) && \
83-
$(if $(filter $(CMAKE_GENERATOR),make), \
84-
$(MAKE), \
85-
$(CMAKE) --build . --target bolt)
83+
$(CMAKE) --build . --target bolt
8684
echo 1 > $@
8785

8886
$(BOLT_BUILDDIR)/build-checked: $(BOLT_BUILDDIR)/build-compiled
8987
ifeq ($(OS),$(BUILD_OS))
9088
cd $(BOLT_BUILDDIR) && \
91-
$(CMAKE) --build . --target check-bolt
89+
$(CMAKE) --build . --target check-bolt
9290
endif
9391
echo 1 > $@
9492

@@ -102,7 +100,7 @@ $(eval $(call staged-install, \
102100

103101
clean-bolt:
104102
-rm -f $(BOLT_BUILDDIR)/build-configured $(BOLT_BUILDDIR)/build-compiled
105-
-$(MAKE) -C $(BOLT_BUILDDIR) clean
103+
-$(CMAKE) --build $(BOLT_BUILDDIR) --target clean
106104

107105
get-bolt: $(BOLT_SRC_FILE)
108106
extract-bolt: $(SRCCACHE)/$(BOLT_SRC_DIR)/source-extracted

‎deps/ittapi.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $(BUILDDIR)/$(ITTAPI_SRC_DIR)/build-configured: $(SRCCACHE)/$(ITTAPI_SRC_DIR)/so
1414
echo 1 > $@
1515

1616
$(BUILDDIR)/$(ITTAPI_SRC_DIR)/build-compiled: $(BUILDDIR)/$(ITTAPI_SRC_DIR)/build-configured
17-
$(MAKE) -C $(dir $<)
17+
$(CMAKE) --build $(dir $<)
1818
echo 1 > $@
1919

2020
define ITTAPI_INSTALL

‎deps/libgit2.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/source-extr
5555
echo 1 > $@
5656

5757
$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-compiled: $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured
58-
$(MAKE) -C $(dir $<)
58+
$(CMAKE) --build $(dir $<)
5959
echo 1 > $@
6060

6161
$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-checked: $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-compiled
6262
ifeq ($(OS),$(BUILD_OS))
63-
$(MAKE) -C $(dir $@) test
63+
$(CMAKE) --build $(dir $@) --target test
6464
endif
6565
echo 1 > $@
6666

@@ -81,7 +81,7 @@ $(eval $(call staged-install, \
8181
clean-libgit2:
8282
-rm -f $(build_datarootdir)/julia/cert.pem
8383
-rm -f $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-compiled
84-
-$(MAKE) -C $(BUILDDIR)/$(LIBGIT2_SRC_DIR) clean
84+
-$(CMAKE) --build $(BUILDDIR)/$(LIBGIT2_SRC_DIR) --target clean
8585

8686
get-libgit2: $(LIBGIT2_SRC_FILE)
8787
extract-libgit2: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted

‎deps/libssh2.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: $(LIBSSH2_SRC_PATH)/source-extr
4141
echo 1 > $@
4242

4343
$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-compiled: $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured
44-
$(MAKE) -C $(dir $<)
44+
$(CMAKE) --build $(dir $<)
4545
echo 1 > $@
4646

4747
$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-checked: $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-compiled
4848
ifeq ($(OS),$(BUILD_OS))
49-
$(MAKE) -C $(dir $@) test
49+
$(CMAKE) --build $(dir $@) --target test
5050
endif
5151
echo 1 > $@
5252

@@ -57,7 +57,7 @@ $(eval $(call staged-install, \
5757

5858
clean-libssh2:
5959
-rm -f $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-compiled
60-
-$(MAKE) -C $(BUILDDIR)/$(LIBSSH2_SRC_DIR) clean
60+
-$(CMAKE) --build $(BUILDDIR)/$(LIBSSH2_SRC_DIR) --target clean
6161

6262

6363
get-libssh2: $(LIBSSH2_SRC_FILE)

‎deps/libsuitesparse.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled: | $(build_prefix)/
5959

6060
$(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/source-patched
6161
cd $(dir $<) && $(CMAKE) . $(LIBSUITESPARSE_CMAKE_FLAGS)
62-
$(MAKE) -C $(dir $<)
63-
$(MAKE) -C $(dir $<) install
62+
$(CMAKE) --build $(dir $<)
63+
$(CMAKE) --build $(dir $<) --target install
6464
echo 1 > $@
6565

6666
ifeq ($(OS),WINNT)
@@ -70,7 +70,7 @@ LIBSUITESPARSE_SHLIB_ENV:=LD_LIBRARY_PATH="$(build_shlibdir)"
7070
endif
7171
$(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-checked: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled
7272
for PROJ in $(shell echo $(subst ;, ,$(LIBSUITESPARSE_PROJECTS))); do \
73-
$(LIBSUITESPARSE_SHLIB_ENV) $(MAKE) -C $(dir $<)$${PROJ} default $(LIBSUITESPARSE_MFLAGS) || exit 1; \
73+
$(LIBSUITESPARSE_SHLIB_ENV) $(CMAKE) --build $(dir $<)$${PROJ} --target default -- $(LIBSUITESPARSE_MFLAGS) || exit 1; \
7474
done
7575
echo 1 > $@
7676

@@ -83,7 +83,7 @@ clean-libsuitesparse: uninstall-libsuitesparse
8383
-rm -f $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled
8484
-rm -fr $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/lib
8585
-rm -fr $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/include
86-
-$(MAKE) -C $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER) clean
86+
-$(CMAKE) --build $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER) --target clean
8787

8888
distclean-libsuitesparse:
8989
rm -rf $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz \

‎deps/libtracyclient.mk‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ $(LIBTRACYCLIENT_BUILDDIR)/build-configured: $(LIBTRACYCLIENT_BUILDDIR)/libTracy
5555

5656
$(LIBTRACYCLIENT_BUILDDIR)/build-compiled: $(LIBTRACYCLIENT_BUILDDIR)/build-configured
5757
cd $(LIBTRACYCLIENT_BUILDDIR) && \
58-
$(if $(filter $(CMAKE_GENERATOR),make), \
59-
$(MAKE), \
60-
$(CMAKE) --build .)
58+
$(CMAKE) --build .
6159
echo 1 > $@
6260

6361
$(eval $(call staged-install, \
@@ -67,7 +65,7 @@ $(eval $(call staged-install, \
6765

6866
clean-libtracyclient:
6967
rm -rf $(LIBTRACYCLIENT_BUILDDIR)/build-configured $(LIBTRACYCLIENT_BUILDDIR)/build-compiled
70-
-$(MAKE) -C $(LIBTRACYCLIENT_BUILDDIR) clean
68+
-$(CMAKE) --build $(LIBTRACYCLIENT_BUILDDIR) --target clean
7169

7270
get-libtracyclient: $(LIBTRACYCLIENT_SRC_FILE)
7371
extract-libtracyclient: $(LIBTRACYCLIENT_BUILDDIR)/source-extracted

‎deps/llvm.mk‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,15 +271,13 @@ $(LLVM_BUILDDIR_withtype)/build-configured: $(SRCCACHE)/$(LLVM_SRC_DIR)/source-e
271271

272272
$(LLVM_BUILDDIR_withtype)/build-compiled: $(LLVM_BUILDDIR_withtype)/build-configured
273273
cd $(LLVM_BUILDDIR_withtype) && \
274-
$(if $(filter $(CMAKE_GENERATOR),make), \
275-
$(MAKE), \
276-
$(CMAKE) --build .)
274+
$(CMAKE) --build .
277275
echo 1 > $@
278276

279277
$(LLVM_BUILDDIR_withtype)/build-checked: $(LLVM_BUILDDIR_withtype)/build-compiled
280278
ifeq ($(OS),$(BUILD_OS))
281279
cd $(LLVM_BUILDDIR_withtype) && \
282-
$(CMAKE) --build . --target check
280+
$(CMAKE) --build . --target check
283281
endif
284282
echo 1 > $@
285283

@@ -304,7 +302,7 @@ $(eval $(call staged-install, \
304302

305303
clean-llvm:
306304
-rm -f $(LLVM_BUILDDIR_withtype)/build-configured $(LLVM_BUILDDIR_withtype)/build-compiled
307-
-$(MAKE) -C $(LLVM_BUILDDIR_withtype) clean
305+
-$(CMAKE) --build $(LLVM_BUILDDIR_withtype) --target clean
308306

309307
get-llvm: $(LLVM_SRC_FILE)
310308
extract-llvm: $(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted

‎deps/unwind.mk‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-configured: $(SRCCACHE)/llvm-proj
129129

130130
$(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-compiled: $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-configured
131131
cd $(dir $<) && \
132-
$(if $(filter $(CMAKE_GENERATOR),make), \
133-
$(MAKE), \
134-
$(CMAKE) --build . --target unwind)
132+
$(CMAKE) --build . --target unwind
135133
echo 1 > $@
136134

137135
LIBUNWIND_INSTALL = \
@@ -146,7 +144,7 @@ $(eval $(call staged-install, \
146144
clean-llvmunwind:
147145
-rm -f $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-configured $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER)/build-compiled
148146
rm -rf $(build_includedir)/mach-o/ $(build_includedir)/unwind.h $(build_includedir)/libunwind.h
149-
-$(MAKE) -C $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER) clean
147+
-$(CMAKE) --build $(BUILDDIR)/llvmunwind-$(LLVMUNWIND_VER) --target clean
150148

151149
distclean-llvmunwind:
152150
rm -rf $(SRCCACHE)/llvm-project-$(LLVMUNWIND_VER).tar.xz \

‎deps/zlib.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $(BUILDDIR)/$(ZLIB_SRC_DIR)/build-configured: $(SRCCACHE)/$(ZLIB_SRC_DIR)/source
1414
echo 1 > $@
1515

1616
$(BUILDDIR)/$(ZLIB_SRC_DIR)/build-compiled: $(BUILDDIR)/$(ZLIB_SRC_DIR)/build-configured
17-
$(MAKE) -C $(dir $<) $(MAKE_COMMON)
17+
$(CMAKE) --build $(dir $<) -- $(MAKE_COMMON)
1818
echo 1 > $@
1919

2020
$(eval $(call staged-install, \
@@ -24,7 +24,7 @@ $(eval $(call staged-install, \
2424

2525
clean-zlib:
2626
-rm -f $(BUILDDIR)/$(ZLIB_SRC_DIR)/build-configured $(BUILDDIR)/$(ZLIB_SRC_DIR)/build-compiled
27-
-$(MAKE) -C $(BUILDDIR)/$(ZLIB_SRC_DIR) clean
27+
-$(CMAKE) --build $(BUILDDIR)/$(ZLIB_SRC_DIR) --target clean
2828

2929
get-zlib: $(ZLIB_SRC_FILE)
3030
extract-zlib: $(BUILDDIR)/$(ZLIB_SRC_DIR)/source-extracted

0 commit comments

Comments
 (0)