gcc-runtime: Make the baremetal changes specific to class-target

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-runtime_%.bbappend
index 90a867ff..ba009a9d 100644
--- a/meta-xilinx-standalone/recipes-standalone/gcc/gcc-runtime_%.bbappend
+++ b/meta-xilinx-standalone/recipes-standalone/gcc/gcc-runtime_%.bbappend
@@ -1,18 +1,18 @@
 # Configure fails on multilib when using a cache file, this re-sets it to nothing
-EXTRA_OECONF_append = " --cache-file="
+EXTRA_OECONF_append_xilinx-standalone_class-target = " --cache-file="
 
 # Dont build libitm, etc.
-RUNTIMETARGET_xilinx-standalone = "libstdc++-v3"
+RUNTIMETARGET_xilinx-standalone_class-target = "libstdc++-v3"
 
-SYMVERS_CONF_xilinx-standalone =""
+SYMVERS_CONF_xilinx-standalone_class-target =""
 
 
-EXTRA_OECONF_append_xilinx-standalone = " --enable-multilib  --with-newlib"
-EXTRA_OECONF_append_xilinx-standalone_cortexr5 = " --with-multilib-list=rmprofile"
-EXTRA_OECONF_append_xilinx-standalone_zc702-zynq7 = " --with-multilib-list=aprofile"
+EXTRA_OECONF_append_xilinx-standalone_class-target = " --enable-multilib  --with-newlib"
+EXTRA_OECONF_append_xilinx-standalone_cortexr5_class-target = " --with-multilib-list=rmprofile"
+EXTRA_OECONF_append_xilinx-standalone_zc702-zynq7_class-target = " --with-multilib-list=aprofile"
 
 # Recursve 5 levels due to the several combinations of multilibs built
-FILES_libstdc++-staticdev += " \
+FILES_libstdc++-staticdev_append_xilinx-standalone_class-target = " \
     ${libdir}/libsupc++.a* \
     ${libdir}/libstdc++*.a* \
     ${libdir}/**/libsupc++.a* \
@@ -26,3 +26,4 @@ FILES_libstdc++-staticdev += " \
     ${libdir}/**/**/**/**/**/libsupc++.a* \
     ${libdir}/**/**/**/**/**/libstdc++*.a* \
 "
+