From 55c13d234c1523861b278f7989b1af105ef0e88f Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 25 Jan 2024 18:06:21 +0100 Subject: [PATCH] Symlink lld and dsymutil in correct build_depsbindir when `USE_SYSTEM_LLD=1` (#53050) Fixes #53049. Two things are addressed: 1. `dsymutil` wasn't linked 2. `lld` was put in `build_bindir`, but on install was looked for in `build_depsbindir` --- base/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/base/Makefile b/base/Makefile index 493302af78b02..6abf9b285ce34 100644 --- a/base/Makefile +++ b/base/Makefile @@ -205,18 +205,24 @@ $(build_bindir)/7z$(EXE): rm -f "$@" && \ ln -svf "$(7Z_PATH)" "$@" -symlink_lld: $(build_bindir)/lld$(EXE) +symlink_llvm_utils: $(build_depsbindir)/lld$(EXE) $(build_depsbindir)/dsymutil$(EXE) ifneq ($(USE_SYSTEM_LLD),0) -SYMLINK_SYSTEM_LIBRARIES += symlink_lld +SYMLINK_SYSTEM_LIBRARIES += symlink_llvm_utils LLD_PATH := $(shell which lld$(EXE)) +DSYMUTIL_PATH := $(shell which dsymutil$(EXE)) endif -$(build_bindir)/lld$(EXE): +$(build_depsbindir)/lld$(EXE): [ -e "$(LLD_PATH)" ] && \ rm -f "$@" && \ ln -svf "$(LLD_PATH)" "$@" +$(build_depsbindir)/dsymutil$(EXE): + [ -e "$(DSYMUTIL_PATH)" ] && \ + rm -f "$@" && \ + ln -svf "$(DSYMUTIL_PATH)" "$@" + # the following excludes: libuv.a, libutf8proc.a ifneq ($(USE_SYSTEM_LIBM),0)