diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
index 639e8a65..3fb7e90a 100644
--- a/.github/workflows/toolchain.yml
+++ b/.github/workflows/toolchain.yml
@@ -72,8 +72,6 @@ jobs:
           URL=https://github.com/${GITHUB_REPOSITORY}/releases/download/${TAG_NAME}/${GCC}
           echo ${URL}
           if ! wget -q --spider ${URL}; then
-            echo BR2_PACKAGE_HOST_GDB=y >> ${CONFIG}
-            echo BR2_PACKAGE_AWS_WEBRTC=y >> ${CONFIG}
             make BOARD=${CONFIG} toolchain
             SDK=$(find output/images -name *_sdk-buildroot.tar.gz)
             mv ${SDK} ${GCC}
diff --git a/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig b/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
index f13d1af1..d6341ed8 100644
--- a/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
+++ b/br-ext-chip-grainmedia/configs/gm8135_lite_defconfig
@@ -8,6 +8,7 @@ BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
 BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-uclibcgnueabi"
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
 
diff --git a/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig b/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
index 64576fd7..bbbaef98 100644
--- a/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
+++ b/br-ext-chip-grainmedia/configs/gm8136_lite_defconfig
@@ -8,6 +8,7 @@ BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
 BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-uclibcgnueabi"
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
 
diff --git a/general/toolchain.mk b/general/toolchain.mk
index 58057e54..2ac3b812 100644
--- a/general/toolchain.mk
+++ b/general/toolchain.mk
@@ -11,6 +11,9 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC),y)
 else
 	@echo "BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y" >> $(BR_CONF)
 endif
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LOCALE),y)
+	@echo "BR2_TOOLCHAIN_BUILDROOT_LOCALE=y" >> $(BR_CONF)
+endif
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CXX),y)
 	@echo "BR2_TOOLCHAIN_BUILDROOT_CXX=y" >> $(BR_CONF)
 endif
@@ -37,3 +40,5 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_0),y)
 	@echo "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y" >> $(BR_CONF)
 endif
 	@echo "BR2_GCC_VERSION_13_X=y" >> $(BR_CONF)
+	@echo "BR2_PACKAGE_HOST_GDB=y" >> $(BR_CONF)
+	@echo "BR2_PACKAGE_AWS_WEBRTC=y" >> $(BR_CONF)