tyler.durden
/
kernel
mirror of https://github.com/FDOS/kernel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCC build: Remove duplicate argument [#fixes #27] 

No need to specify output file in NASMFLAGS as Watcom needs it specified
in the rule. Newer versions of NASM see duplicate output file as an error.
This commit is contained in:
Andrew Bird 2020-10-14 12:31:53 +01:00 committed by Kenneth J Davis
parent 977023f85c
commit a7b7ce71d0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/makefile
View File

@ -158,7 +158,7 @@ initclk.obj: initclk.c $(INITHEADERS) $(TARGET).lnk
#the string functions for INIT_TEXT
iasmsupt.obj: asmsupt.asm $(TARGET).lnk
$(NASM) -D$(COMPILER) -D_INIT -f obj $(NASMFLAGS) -o iasmsupt.obj asmsupt.asm
$(NASM) -D$(COMPILER) -D_INIT -f obj $(NASMFLAGS) -o $@ asmsupt.asm
#the printf for INIT_TEXT - yet another special case, this file includes prf.c
iprf.obj: iprf.c prf.c $(HDR)portab.h $(TARGET).lnk

4
mkfiles/gcc.mak
View File

@ -25,7 +25,7 @@ NASMFLAGS+=-DWITHFAT32
endif
NASM=$(XNASM)
NASMFLAGS+=-i../hdr/ -DXCPU=$(XCPU) -felf -o $@
NASMFLAGS+=-i../hdr/ -DXCPU=$(XCPU) -felf
CC=ia16-elf-gcc -c
CL=ia16-elf-gcc
@ -78,7 +78,7 @@ LINK=$(XLINK) -Tkernel.ld -Wl,-Map,kernel.map -o kernel.exe $(OBJS) -Wl,--whole-
# *Implicit Rules*
.asm.obj :
$(NASM) -D$(COMPILER) $(NASMFLAGS) $*.asm
$(NASM) -D$(COMPILER) $(NASMFLAGS) -o $@ $<
.c.obj :
$(CC) $(CFLAGS) $*.c