Skip to content

Commit bee75f7

Browse files
authored
Fix make binary-dist when using USE_BINARYBUILDER_LLVM=0 (#55731)
`make binary-dist` expects lld to be in usr/tools but it ends up in usr/bin so I copied it into usr/tools. Should fix the scheduled source tests which currently fail at linking. I think this is also broken with `USE_BINARYBUILDER_LLVM=0` and `BUILD_LLD=0`, maybe ceaeb7b is the fix? --------- Co-authored-by: Zentrik <Zentrik@users.noreply.github.com>
1 parent d7e417d commit bee75f7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

deps/llvm.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,9 @@ ifeq ($(OS),Darwin)
292292
# https://github.com/JuliaLang/julia/issues/29981
293293
LLVM_INSTALL += && ln -s libLLVM.dylib $2$$(build_shlibdir)/libLLVM-$$(LLVM_VER_SHORT).dylib
294294
endif
295+
ifeq ($(BUILD_LLD), 1)
296+
LLVM_INSTALL += && cp $2$$(build_bindir)/lld$$(EXE) $2$$(build_depsbindir)
297+
endif
295298

296299
$(eval $(call staged-install, \
297300
llvm,$$(LLVM_SRC_DIR)/build_$$(LLVM_BUILDTYPE), \

0 commit comments

Comments
 (0)