From a58e63216136884cc59bdd41531491829684407f Mon Sep 17 00:00:00 2001 From: raghav-g13 <58498249+raghav-g13@users.noreply.github.com> Date: Sun, 5 Nov 2023 03:07:32 +0000 Subject: [PATCH 1/2] use TARGET instead of prefix in /tests makefiles --- tests/Makefile | 17 +++++++++-------- tests/libgloss.mk | 4 ++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 28976a6a6e..5af9c9f178 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2,14 +2,15 @@ # RISCV Toolchain ################################# -PREFIX = riscv64-unknown-elf- - -GCC = $(PREFIX)gcc -CXX = $(PREFIX)g++ -CP = $(PREFIX)objcopy -OBJDUMP = $(PREFIX)objdump -DG = $(PREFIX)gdb -SIZE = $(PREFIX)size + +TARGET = riscv64-unknown-elf + +GCC = $(TARGET)-gcc +CXX = $(TARGET)-g++ +CP = $(TARGET)-objcopy +OBJDUMP = $(TARGET)-objdump +DG = $(TARGET)-gdb +SIZE = $(TARGET)-size ################################# diff --git a/tests/libgloss.mk b/tests/libgloss.mk index 2272df3347..5553bdbdd3 100644 --- a/tests/libgloss.mk +++ b/tests/libgloss.mk @@ -5,6 +5,10 @@ ifndef GCC $(error GCC is not defined) endif +ifndef TARGET +$(error TARGET is not defined) +endif + libgloss_specs := htif_nano.specs # Test whether libgloss-htif is globally installed and usable From 54f72378ea57c659683c001c6e6279d7c2b6d382 Mon Sep 17 00:00:00 2001 From: Raghav Gupta <58498249+raghav-g13@users.noreply.github.com> Date: Sat, 4 Nov 2023 20:26:50 -0700 Subject: [PATCH 2/2] Extraneous newline in Makefile --- tests/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 5af9c9f178..670b49ea3a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2,7 +2,6 @@ # RISCV Toolchain ################################# - TARGET = riscv64-unknown-elf GCC = $(TARGET)-gcc