Skip to content

Commit

Permalink
Fix make binary-dist when using USE_BINARYBUILDER_LLVM=0 (#55731)
Browse files Browse the repository at this point in the history
`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>
  • Loading branch information
2 people authored and pull[bot] committed Dec 5, 2024
1 parent 9ef59fa commit 210225e
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions deps/llvm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,9 @@ ifeq ($(OS),Darwin)
# https://github.com/JuliaLang/julia/issues/29981
LLVM_INSTALL += && ln -s libLLVM.dylib $2$$(build_shlibdir)/libLLVM-$$(LLVM_VER_SHORT).dylib
endif
ifeq ($(BUILD_LLD), 1)
LLVM_INSTALL += && cp $2$$(build_bindir)/lld$$(EXE) $2$$(build_depsbindir)
endif

$(eval $(call staged-install, \
llvm,$$(LLVM_SRC_DIR)/build_$$(LLVM_BUILDTYPE), \
Expand Down

0 comments on commit 210225e

Please sign in to comment.