2 files changed, 9 insertions, 0 deletions

diff --git a/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx-standalone/conf/layer.conf
index cef1039e..de1acee8 100644
--- a/meta-xilinx-standalone/conf/layer.conf
+++ b/meta-xilinx-standalone/conf/layer.conf
@@ -13,6 +13,7 @@ BBFILE_PATTERN_xilinx-standalone = "^${LAYERDIR}/"
 BBFILE_PRIORITY_xilinx-standalone = "7"
 
 LAYERDEPENDS_xilinx-standalone = "core xilinx"
+LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze"
 
 LAYERSERIES_COMPAT_xilinx-standalone = "dunfell gatesgarth"
 XILINX_RELEASE_VERSION = "v2020.2"
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend
index e1876700..d3abc611 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend
@@ -5,3 +5,11 @@ FILESEXTRAPATHS_append_microblaze_xilinx-standalone := ":${THISDIR}/gcc-10"
 SRC_URI_append_microblaze_xilinx-standalone = " \
         file://additional-microblaze-multilibs.patch \
 "
+
+CHECK_FOR_MICROBLAZE_microblaze = "1"
+
+python() {
+    if d.getVar('CHECK_FOR_MICROBLAZE') == '1':
+        if 'xilinx-microblaze' not in d.getVar('BBFILE_COLLECTIONS').split():
+            bb.fatal('You must include the meta-microblaze layer to build for this configuration.')
+}