2 files changed, 12 insertions, 1 deletions
diff --git a/scripts/build/arch/avr.sh b/scripts/build/arch/avr.sh
index 501b020..fd8c8ed 100644
--- a/scripts/build/arch/avr.sh
+++ b/scripts/build/arch/avr.sh
@@ -2,4 +2,11 @@
 
 CT_DoArchTupleValues() {
     CT_TARGET_ARCH="${CT_ARCH}"
+    case "${CT_LIBC}" in
+    avr-libc)
+        # avr-libc only seems to work with the non-canonical "avr" target.
+        CT_TARGET_SKIP_CONFIG_SUB=y
+        CT_TARGET_SYS= # CT_TARGET_SYS must be empty
+        ;;
+    esac
 }
diff --git a/scripts/build/arch/moxie.sh b/scripts/build/arch/moxie.sh
index 91a9969..72c82c9 100644
--- a/scripts/build/arch/moxie.sh
+++ b/scripts/build/arch/moxie.sh
@@ -3,5 +3,9 @@
 # No arch-specific overrides yet
 CT_DoArchTupleValues()
 {
-    :
+    case "${CT_LIBC}" in
+    moxiebox)
+        CT_TARGET_SYS=moxiebox
+        ;;
+    esac
 }