diff --git a/am/arch/isa/riscv64.mk b/am/arch/isa/riscv64.mk
index 469ea63da076ac317fb0dda3a2f35dd69ac4bf12..c04c95385ea50341e9e1d156c8414f2e10661011 100644
--- a/am/arch/isa/riscv64.mk
+++ b/am/arch/isa/riscv64.mk
@@ -1,5 +1,10 @@
+ifeq ($(LINUX_GNU_TOOLCHAIN),1)
+CROSS_COMPILE := riscv64-linux-gnu-
+COMMON_FLAGS  := -fno-pic -march=rv64gc -mcmodel=medany
+else
 CROSS_COMPILE := riscv64-unknown-linux-gnu-
 COMMON_FLAGS  := -fno-pic -march=rv64gc_zba_zbb_zbc_zbs_zbkb_zbkc_zbkx_zknd_zkne_zknh_zkr_zksed_zksh_zkt -mcmodel=medany
+endif
 CFLAGS        += $(COMMON_FLAGS) -static
 ASFLAGS       += $(COMMON_FLAGS) -O0
 LDFLAGS       += -melf64lriscv