fix CROSS_LD deps

dosemu2 · Nov 1, 2023 · 53a1b24 · 53a1b24
1 parent 288660a
commit 53a1b24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/debian/control b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
     clang,
     nasm-segelf,
     binutils,
+    binutils-x86-64-linux-gnu,
     coreutils,
     libelf-dev,
     autoconf,

diff --git a/fdpp.spec.rpkg b/fdpp.spec.rpkg
@@ -20,8 +20,9 @@ BuildRequires: flex
 BuildRequires: sed
 BuildRequires: bash
 BuildRequires: clang
-BuildRequires: nasm
-BuildRequires: lld
+BuildRequires: nasm-segelf
+BuildRequires: binutils
+BuildRequires: binutils-x86_64-linux-gnu
 BuildRequires: coreutils
 BuildRequires: libstdc++-devel
 BuildRequires: elfutils-libelf-devel

diff --git a/fdpp/clang.mak b/fdpp/clang.mak
@@ -3,7 +3,7 @@
 #
 
 LD ?= ld
-LLD ?= $(shell which ld.lld 2>/dev/null)
+CROSS_LD ?= x86_64-linux-gnu-ld
 CCACHE ?= $(shell which ccache 2>/dev/null)
 CC = $(CCACHE) clang++
 CLANG_VER := $(shell $(CC) -v 2>&1 | head -n 1 | \
@@ -24,12 +24,6 @@ endif
 CC_FOR_BUILD = $(CCACHE) clang
 CPP = $(CC_FOR_BUILD) -E
 CC_LD = $(CL)
-ifeq ($(LD),)
-# ld.lld can cross-compile while gnu ld not
-CROSS_LD ?= $(LLD)
-else
-CROSS_LD ?= $(LD)
-endif
 NASM ?= nasm
 PKG_CONFIG ?= pkg-config