diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 982e979a840..5136c0571e8 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -5201,8 +5201,12 @@ AC_DEFUN([GLIBCXX_ZONEINFO_DIR], [
 	zoneinfo_dir=none
 	;;
     esac
-    # Also embed a copy of the tzdata.zi file as a static string.
-    embed_zoneinfo=yes
+    case "$host" in
+      avr-*-* | msp430-*-* ) embed_zoneinfo=no ;;
+      *)
+	# Also embed a copy of the tzdata.zi file as a static string.
+	embed_zoneinfo=yes ;;
+    esac
   elif test "x${with_libstdcxx_zoneinfo}" = xno; then
     # Disable tzdb support completely.
     zoneinfo_dir=none
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index a298cbd45a0..68ee94c9e28 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -71557,8 +71557,12 @@ fi
 	zoneinfo_dir=none
 	;;
     esac
-    # Also embed a copy of the tzdata.zi file as a static string.
-    embed_zoneinfo=yes
+    case "$host" in
+      avr-*-* | msp430-*-* ) embed_zoneinfo=no ;;
+      *)
+	# Also embed a copy of the tzdata.zi file as a static string.
+	embed_zoneinfo=yes ;;
+    esac
   elif test "x${with_libstdcxx_zoneinfo}" = xno; then
     # Disable tzdb support completely.
     zoneinfo_dir=none