benji/portland-os
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removing old cpp stuff from makefile

Browse source
This commit is contained in:
Benji Dial 2020-11-07 15:34:35 -05:00
parent 7ec5323d1b
commit 594aeeb09b
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
makefile
View file

@ -1,6 +1,5 @@
kgccargs = -Wall -Wsuggest-attribute=pure -Wsuggest-attribute=const -m32 -Og -ffreestanding -fno-asynchronous-unwind-tables kgccargs = -Wall -Wsuggest-attribute=pure -Wsuggest-attribute=const -m32 -Og -ffreestanding -fno-asynchronous-unwind-tables
ugccargs = ${kgccargs} -Isrc/user/include ugccargs = ${kgccargs} -Isrc/user/include
ugppargs = ${kgccargs} -Isrc/user/include/cpp -Isrc/user/include
nasmargs = -f elf32 nasmargs = -f elf32
partlink = -r -m elf_i386 partlink = -r -m elf_i386
@ -65,10 +64,6 @@ obj/%.ao: src/user/%.asm
mkdir -p $(shell dirname $@) mkdir -p $(shell dirname $@)
nasm ${nasmargs} $< -o $@ nasm ${nasmargs} $< -o $@
obj/%.po: src/user/%.cpp
mkdir -p $(shell dirname $@)
g++ ${ugppargs} -c $< -o $@
obj/c.rto: obj/runtimes/c/entry.ao obj/c.rto: obj/runtimes/c/entry.ao
ld ${partlink} obj/runtimes/c/* -o obj/c.rto ld ${partlink} obj/runtimes/c/* -o obj/c.rto
@ -80,10 +75,6 @@ obj/knob.so: obj/knob/env.o obj/knob/file.o obj/knob/format.o \
obj/knob/block.o obj/knob/block.o
ld ${partlink} $^ -o $@ ld ${partlink} $^ -o $@
obj/cove.so: obj/cove/cove.po obj/cove/buttons.po obj/cove/label.po \
obj/cove/vlist.po
ld ${partlink} $^ -o $@
obj/init.elf: obj/init/init.o obj/knob.so obj/c.rto obj/init.elf: obj/init/init.o obj/knob.so obj/c.rto
ld -T src/user/runtimes/c/elf.ld $^ -o $@ ld -T src/user/runtimes/c/elf.ld $^ -o $@