Skip to content

Commit

Permalink
Additional fixes to ensure portability
Browse files Browse the repository at this point in the history
  • Loading branch information
LuigiGhionda committed Jan 26, 2025
1 parent caed2c0 commit 489cb58
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
8 changes: 5 additions & 3 deletions carfield.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
# Generic variable initialization #
###################################

SHELL := /bin/bash

CAR_ROOT ?= $(shell $(BENDER) path carfield)
CAR_HW_DIR := $(CAR_ROOT)/hw
CAR_SW_DIR := $(CAR_ROOT)/sw
Expand Down Expand Up @@ -374,9 +376,9 @@ $(CAR_SW_DIR)/benchmarks/mibench:
git clone https://github.com/alex96295/mibench.git -b carfield $@

# Litmus tests
LITMUS_WORK_DIR := work-litmus
LITMUS_TEST_LIST := $(LITMUS_WORK_DIR)/litmus-tests.list
LITMUS_TESTS := $(shell xargs printf '\n%s' < $(LITMUS_TEST_LIST) | cut -b 1-)
# LITMUS_WORK_DIR := work-litmus
# LITMUS_TEST_LIST := $(LITMUS_WORK_DIR)/litmus-tests.list
# LITMUS_TESTS := $(shell xargs printf '\n%s' < $(LITMUS_TEST_LIST) | cut -b 1-)

$(LITMUS_WORK_DIR):
mkdir -p $(LITMUS_WORK_DIR)
Expand Down
6 changes: 5 additions & 1 deletion env/env-non-iis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@ if [ -z "${BENDER}" ]; then
fi

if ! which "riscv64-unknown-elf-gcc" >/dev/null 2>&1; then
echo "RISCV toolchain is NOT in the PATH."
echo "RISCV64 toolchain is NOT in the PATH."
fi

if ! which "riscv32-unknown-elf-gcc" >/dev/null 2>&1; then
echo "RISCV32 toolchain is NOT in the PATH."
fi

0 comments on commit 489cb58

Please sign in to comment.