diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 57aeb96ab5..0e29fbfa10 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -47,6 +47,9 @@ CLANG_VERSION=18.1.8
 CMAKE_VERSION=3.31.3
 NASM_VERSION=2.16.03
 
+# Architecture-specific options
+RISCV_ISA_SPEC=20191213
+
 # Filename for each package
 GMP_ARCHIVE="gmp-${GMP_VERSION}.tar.xz"
 MPFR_ARCHIVE="mpfr-${MPFR_VERSION}.tar.xz"
@@ -1042,8 +1045,8 @@ case "$TARGETARCH" in
 	i386-mingw32)		;;
 	riscv-elf | riscv64-elf)
 				TARGETARCH=riscv64-elf
-				TARGET_GCC_OPTIONS="$TARGET_GCC_OPTIONS --with-isa-spec=20191213"
-				TARGET_BINUTILS_OPTIONS="$TARGET_BINUTILS_OPTIONS --with-isa-spec=20191213";;
+				TARGET_GCC_OPTIONS="$TARGET_GCC_OPTIONS --with-isa-spec=${RISCV_ISA_SPEC}"
+				TARGET_BINUTILS_OPTIONS="$TARGET_BINUTILS_OPTIONS --with-isa-spec=${RISCV_ISA_SPEC}";;
 	powerpc64*-linux*)	;;
 	i386*)			TARGETARCH=i386-elf;;
 	arm*)			TARGETARCH=arm-eabi;;