3 files changed, 24 insertions, 4 deletions
diff --git a/spec/build/cpukit/cpuopts.yml b/spec/build/cpukit/cpuopts.yml
index f1b30eec55..1d28ace552 100644
--- a/spec/build/cpukit/cpuopts.yml
+++ b/spec/build/cpukit/cpuopts.yml
@@ -8,6 +8,8 @@ include-headers: []
 install-path: ${BSP_INCLUDEDIR}/rtems/score
 links:
 - role: build-dependency
+  uid: optprogramprefix
+- role: build-dependency
   uid: optgcc
 - role: build-dependency
   uid: optarchbits
diff --git a/spec/build/cpukit/optgcc.yml b/spec/build/cpukit/optgcc.yml
index 3afb909444..94af494af4 100644
--- a/spec/build/cpukit/optgcc.yml
+++ b/spec/build/cpukit/optgcc.yml
@@ -1,21 +1,21 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
-- set-value: ${ARCH}-rtems${__RTEMS_MAJOR__}-gcc
+- set-value: ${PROGRAM_PREFIX}gcc
 - substitute: null
 - find-program: null
 - env-assign: AS
 - env-assign: CC
 - env-assign: LINK_CC
-- set-value: ${ARCH}-rtems${__RTEMS_MAJOR__}-g++
+- set-value: ${PROGRAM_PREFIX}g++
 - substitute: null
 - find-program: null
 - env-assign: CXX
 - env-assign: LINK_CXX
-- set-value: ${ARCH}-rtems${__RTEMS_MAJOR__}-ar
+- set-value: ${PROGRAM_PREFIX}ar
 - substitute: null
 - find-program: null
 - env-assign: AR
-- set-value: ${ARCH}-rtems${__RTEMS_MAJOR__}-ld
+- set-value: ${PROGRAM_PREFIX}ld
 - substitute: null
 - find-program: null
 - env-assign: LD
diff --git a/spec/build/cpukit/optprogramprefix.yml b/spec/build/cpukit/optprogramprefix.yml
new file mode 100644
index 0000000000..73deef79d1
--- /dev/null
+++ b/spec/build/cpukit/optprogramprefix.yml
@@ -0,0 +1,18 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+actions:
+- get-string: null
+- substitute: null
+- env-assign: null
+build-type: option
+copyrights:
+- Copyright (C) 2023 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: ${ARCH}-rtems${__RTEMS_MAJOR__}-
+description: |
+  Defines the program prefix of tools (compiler, assembler, linker).
+enabled-by: true
+format: '{}'
+links: []
+name: PROGRAM_PREFIX
+type: build