Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Get rid of RISCV_CFLAGS variable as it is now unnecessary

This commit is contained in:
mintsuki 2023-07-13 07:58:07 +02:00
parent a1b4ff0b46
commit bf2a37992d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/GNUmakefile
View File

@ -131,16 +131,18 @@ ifeq ($(TARGET),uefi-aarch64)
endif endif
ifeq ($(TARGET),uefi-riscv64) ifeq ($(TARGET),uefi-riscv64)
override CFLAGS_FOR_TARGET += \
-fPIE \
-fshort-wchar
ifeq ($(CC_FOR_TARGET_IS_CLANG),yes) ifeq ($(CC_FOR_TARGET_IS_CLANG),yes)
override RISCV_CFLAGS += -march=rv64imac -mabi=lp64 override CFLAGS_FOR_TARGET += -march=rv64imac
else else
override RISCV_CFLAGS += -march=rv64imac_zicsr_zifencei -mabi=lp64 override CFLAGS_FOR_TARGET += -march=rv64imac_zicsr_zifencei
endif endif
override CFLAGS_FOR_TARGET += \ override CFLAGS_FOR_TARGET += \
-fPIE \ -mabi=lp64
-fshort-wchar \
$(RISCV_CFLAGS)
override CPPFLAGS_FOR_TARGET := \ override CPPFLAGS_FOR_TARGET := \
-I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc' \ -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc' \
@ -435,7 +437,7 @@ $(call MKESCAPE,$(BUILDDIR))/BOOTRISCV64.EFI: $(call MKESCAPE,$(BUILDDIR))/limin
$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-riscv64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_riscv64.c.o: $(call MKESCAPE,$(BUILDDIR))/limine-efi $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-riscv64.S.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_riscv64.c.o: $(call MKESCAPE,$(BUILDDIR))/limine-efi
$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/gnuefi' \ $(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/gnuefi' \
CC="$(CC_FOR_TARGET)" \ CC="$(CC_FOR_TARGET)" \
CFLAGS="$(BASE_CFLAGS) $(RISCV_CFLAGS)" \ CFLAGS="$(BASE_CFLAGS)" \
CPPFLAGS='-nostdinc -I$(call SHESCAPE,$(SRCDIR))/../freestanding-headers' \ CPPFLAGS='-nostdinc -I$(call SHESCAPE,$(SRCDIR))/../freestanding-headers' \
ARCH=riscv64 ARCH=riscv64