meson: use ld.bfd for kernel

dosemu2 · Jun 13, 2024 · 3b3be67 · 3b3be67
1 parent 2b8b5da
commit 3b3be67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/fdpp/kernel/meson.build b/fdpp/kernel/meson.build
@@ -71,7 +71,7 @@ lib = static_library('dummy',
   include_directories: incdir2,
   nasm_args: nargs,
   build_by_default: false)
-nasm_ld = find_program(['i686-linux-gnu-ld', 'i386-elf-ld', 'x86_64-linux-gnu-ld', 'ld'])
+nasm_ld = find_program(['i686-linux-gnu-ld', 'i386-elf-ld', 'x86_64-linux-gnu-ld', 'ld.bfd'])
 custom_target(TARGET + '.elf',
   output: [TARGET + '.elf', TARGET + '.map'],
   input: lib.extract_all_objects(recursive: true),

diff --git a/fdpp/kernel/toolchain.ini b/fdpp/kernel/toolchain.ini
@@ -1,6 +1,7 @@
 [binaries]
 nasm = 'nasm-segelf'
 c = 'clang'
+c_ld = 'bfd'
 cpp = 'clang++'
 strip = 'llvm-strip'
 pkg-config = 'pkg-config'