Skip to content

Commit 3ab8fef

Browse files
authored
Fix some dependency build issues with USE_BINARYBUILDER=0 (#55091)
A couple of the changes made in #54538 were incorrect. In particular: - libunwind (non-LLVM) does not use CMake, so the `$(CMAKE) --build` is simply reverted here back to `$(MAKE) -C`. - zlib does use CMake but regular Make flags were being passed to its `$(CMAKE) --build`. Those can just be dropped since it's already getting the proper CMake flags.
1 parent 24535f6 commit 3ab8fef

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

deps/unwind.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ $(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured: $(SRCCACHE)/libunwind-$(UN
4848
echo 1 > $@
4949

5050
$(BUILDDIR)/libunwind-$(UNWIND_VER)/build-compiled: $(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured
51-
$(CMAKE) --build $(dir $<)
51+
$(MAKE) -C $(dir $<)
5252
echo 1 > $@
5353

5454
$(BUILDDIR)/libunwind-$(UNWIND_VER)/build-checked: $(BUILDDIR)/libunwind-$(UNWIND_VER)/build-compiled
5555
ifeq ($(OS),$(BUILD_OS))
56-
$(CMAKE) --build $(dir $@) check
56+
$(MAKE) -C $(dir $@) check
5757
endif
5858
echo 1 > $@
5959

deps/zlib.mk

Lines changed: 1 addition & 1 deletion
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-
$(CMAKE) --build $(dir $<) $(MAKE_COMMON)
17+
$(CMAKE) --build $(dir $<)
1818
echo 1 > $@
1919

2020
$(eval $(call staged-install, \

0 commit comments

Comments
 (0)