Skip to content

Commit

Permalink
kernel: fix some build paths
Browse files Browse the repository at this point in the history
  • Loading branch information
EtchedPixels committed Oct 6, 2023
1 parent cd848db commit f44354d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
18 changes: 0 additions & 18 deletions Kernel/cpu-armm0/rules.mk
Original file line number Diff line number Diff line change
@@ -1,18 +0,0 @@
export CROSS_LD = xtensa-lx106-elf-ld
export CROSS_CC = xtensa-lx106-elf-gcc
# Do not use the Fedora gcc 5.3.1. It miscompiles stuff badly.
export CROSS_CCOPTS=-c -g -Os -fno-strict-aliasing -fomit-frame-pointer -fno-builtin -Wall -I$(ROOT_DIR)/cpu-lx106 -I$(ROOT_DIR)/platform-$(TARGET) -I$(ROOT_DIR)/include -I$(ROOT_DIR) -mlongcalls -mforce-l32 -mforce-no-pic
export CROSS_AS=$(CROSS_CC) $(CROSS_CCOPTS)
export CROSS_CC_SEG1=
export CROSS_CC_SEG2=
export CROSS_CC_SEG3=
# Fixme: we should split discard off
export CROSS_CC_SEGDISC=
export CROSS_CC_VIDEO=
export CROSS_CC_FONT=
export CROSS_CC_NETWORK=
export ASOPTS=
export ASMEXT = .S
export BINEXT = .o
export BITS = 32
export EXECFORFMAT = elf32
2 changes: 1 addition & 1 deletion Kernel/platform/platform-esp32/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ all: $(OBJS)
$(AOBJS): %.o: %.S
$(CROSS_AS) $(ASOPTS) -I.. $< -o $@

$(OBJS): ../../kernel-esp32.def
$(OBJS): ../../cpu-esp32/kernel-esp32.def

$(COBJS): %.o: %.c
$(CROSS_CC) -I../../dev/ -I../../dev/net $(CROSS_CCOPTS) $< -o $@
Expand Down

0 comments on commit f44354d

Please sign in to comment.