Skip to content

Commit

Permalink
switch back to binutils objcopy [#146]
Browse files Browse the repository at this point in the history 
This allows to get Bionic back in.
Xenial doesn't have lld, so remains broken.
  • Loading branch information
@stsp
stsp committed Oct 2, 2020
1 parent 543c1ec commit 24a252a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Build-Depends:
clang,
nasm,
lld,
llvm,
binutils,
libstdc++-dev,
autoconf,
git,
Expand Down
2 changes: 1 addition & 1 deletion fdpp.spec.rpkg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ BuildRequires: bash
BuildRequires: clang
BuildRequires: nasm
BuildRequires: lld
BuildRequires: llvm
BuildRequires: binutils
BuildRequires: libstdc++-devel
BuildRequires: autoconf
BuildRequires: git
Expand Down
2 changes: 1 addition & 1 deletion fdpp/clang.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CL = clang++
CLC = clang
NASM = nasm
LINK = ld.lld
OBJCOPY = llvm-objcopy
OBJCOPY = objcopy

TARGETOPT = -std=c++11 -c -fno-threadsafe-statics -fpic
# _XTRA should go at the end of cmd line
Expand Down

3 comments on commit 24a252a

@andrewbird
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

ld.lld -melf_i386 -static -Map fdppkrnl.map -o fdppkrnl.elf -T/clients/common/fdpp.git/fdpp/kernel.ld kernel.o entry.o io.o console.o serial.o printer.o execrh.o nlssupt.o procsupt.o dosidle.o int2f.o nls_hc.o intr.o irqstack.o cpu.o plt.o cdata.o floppy.o rdpcclk.o wrpcclk.o wratclk.o
bash: ld.lld: command not found
make[1]: *** [makefile:58: fdppkrnl.elf] Error 127
make[1]: Leaving directory '/clients/common/fdpp.git/fdpp'
make: *** [makefile:13: all] Error 2

ld.lld seems to be in package lld on my Ubuntu 20.04 system, not binutils

@stsp
Copy link
Member Author

@stsp stsp commented on 24a252a Nov 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So what is the problem?
There is a dep on lld too.

@andrewbird
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh I missed that, so no problem!

Please sign in to comment.