Skip to content

Commit 23b35bf

Browse files
committed
Use llvm-config to list LLVM libraries
1 parent 9127eb2 commit 23b35bf

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/utils/hsdis/Makefile

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,9 @@ LIBRARIES = $(TARGET_DIR)/bfd/libbfd.a \
195195
$(TARGET_DIR)/opcodes/libopcodes.a \
196196
$(TARGET_DIR)/libiberty/libiberty.a
197197
else
198-
LIBRARIES/amd64 = LLVMX86Disassembler LLVMX86AsmParser LLVMX86CodeGen LLVMCFGuard LLVMGlobalISel LLVMSelectionDAG \
199-
LLVMAsmPrinter LLVMDebugInfoDWARF LLVMCodeGen LLVMTarget LLVMScalarOpts LLVMInstCombine LLVMAggressiveInstCombine \
200-
LLVMTransformUtils LLVMBitWriter LLVMAnalysis LLVMProfileData LLVMX86Desc LLVMObject LLVMTextAPI LLVMMCParser \
201-
LLVMBitReader LLVMCore LLVMRemarks LLVMBitstreamReader LLVMMCDisassembler LLVMMC LLVMDebugInfoCodeView \
202-
LLVMDebugInfoMSF LLVMBinaryFormat LLVMX86Utils LLVMX86Info LLVMSupport LLVMDemangle
203-
204-
LIBRARIES/aarch64 = LLVMAArch64Disassembler LLVMMCDisassembler LLVMAArch64CodeGen LLVMCFGuard LLVMGlobalISel \
205-
LLVMSelectionDAG LLVMAsmPrinter LLVMDebugInfoDWARF LLVMCodeGen LLVMTarget LLVMScalarOpts LLVMInstCombine \
206-
LLVMAggressiveInstCombine LLVMTransformUtils LLVMBitWriter LLVMAnalysis LLVMProfileData LLVMObject \
207-
LLVMTextAPI LLVMBitReader LLVMCore LLVMRemarks LLVMBitstreamReader LLVMAArch64AsmParser LLVMMCParser \
208-
LLVMAArch64Desc LLVMMC LLVMDebugInfoCodeView LLVMDebugInfoMSF LLVMBinaryFormat LLVMAArch64Utils LLVMAArch64Info \
209-
LLVMSupport LLVMDemangle
198+
LIBRARIES/i386 = $(patsubst -l%,%,$(shell $(LLVMDIR)/bin/llvm-config --libs x86 x86disassembler))
199+
LIBRARIES/amd64 = $(patsubst -l%,%,$(shell $(LLVMDIR)/bin/llvm-config --libs x86 x86disassembler))
200+
LIBRARIES/aarch64 = $(patsubst -l%,%,$(shell $(LLVMDIR)/bin/llvm-config --libs aarch64 aarch64disassembler))
210201

211202
ifeq ($(LIBRARIES/$(ARCH)),)
212203
$(error "unknown LLVM libraries for ARCH=$(ARCH))
@@ -219,6 +210,10 @@ ifneq ($(MINGW),)
219210
LIBRARIES += $(TARGET_DIR)/zlib/libz.a
220211
endif
221212

213+
ifneq ($(LLVM),)
214+
DLDFLAGS+=$(shell $(LLVMDIR)/bin/llvm-config --system-libs)
215+
endif
216+
222217
DEMO_TARGET = $(TARGET_DIR)/hsdis-demo
223218
DEMO_SOURCE = hsdis-demo.c
224219

0 commit comments

Comments
 (0)