Skip to content

Commit f9ca4a6

Browse files
committed
CI: Detect LLVM toolchain properly
This commit resolves LLVM build failures. Root Cause: - TOOLCHAIN_TYPE passed to main make but not to sub-make - Line 64 in Makefile: $(MAKE) __link spawns sub-make - Sub-make doesn't inherit TOOLCHAIN_TYPE, defaults to CC_IS_CLANG auto-detect Fix: - Check TOOLCHAIN_TYPE=llvm before auto-detection - Export TOOLCHAIN_TYPE when set to 'llvm' - Sub-makes now inherit toolchain selection
1 parent fdd7587 commit f9ca4a6

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

arch/riscv/build.mk

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,15 @@ DEFINES := -DF_CPU=$(F_CLK) \
1919

2020
CROSS_COMPILE ?= riscv-none-elf-
2121

22-
# Detect LLVM/Clang toolchain (allow user override)
23-
CC_IS_CLANG ?= $(shell $(CROSS_COMPILE)clang --version 2>/dev/null | grep -qi clang && echo 1)
22+
# Detect LLVM/Clang toolchain
23+
# Priority: TOOLCHAIN_TYPE env var > CC_IS_CLANG var > auto-detection
24+
ifeq ($(TOOLCHAIN_TYPE),llvm)
25+
CC_IS_CLANG := 1
26+
# Export for sub-makes
27+
export TOOLCHAIN_TYPE
28+
else
29+
CC_IS_CLANG ?= $(shell $(CROSS_COMPILE)clang --version 2>/dev/null | grep -qi clang && echo 1)
30+
endif
2431

2532
# Architecture flags
2633
ARCH_FLAGS = -march=rv32imzicsr -mabi=ilp32

0 commit comments

Comments
 (0)