Disable static toolchains, enable fixed-point math.

qmk · Mar 3, 2024 · fceedd4 · fceedd4
1 parent 18aa438
commit fceedd4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/arm-native.sh b/arm-native.sh
@@ -6,10 +6,6 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ "$(uname -s)" == "Linux" ]]; then
-    extra_args="--static-toolchain"
-fi
-
 build_one \
     --sample-name=arm-none-eabi \
     --multilib-list=rmprofile \

diff --git a/avr-native.sh b/avr-native.sh
@@ -6,10 +6,6 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ "$(uname -s)" == "Linux" ]]; then
-    extra_args="--static-toolchain"
-fi
-
 build_one \
     --sample-name=avr \
     --no-cross-gdb-python \

diff --git a/common.bashinc b/common.bashinc
@@ -201,6 +201,7 @@ function build_one() {
         -e 's@^.*CT_LOCAL_TARBALLS_DIR.*$@CT_LOCAL_TARBALLS_DIR="'"$script_dir/tarballs"'"@' \
         .config
     echo "CT_BINUTILS_PLUGINS=y" >> .config
+    echo 'CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-version-specific-runtime-libs --enable-fixed-point"' >> .config
     ct-ng olddefconfig
 
     # Swap to an older version of Linux to avoid issues with older distros, especially things like older Debian with Raspberry Pi targets.
@@ -310,7 +311,7 @@ function build_one() {
     echo "CT_DEBUG_CT_SAVE_STEPS=y" >>.config
     echo "CT_DEBUG_CT_SAVE_STEPS_GZIP=y" >>.config
     ct-ng olddefconfig
-    echo "CT_TOOLCHAIN_PKGVERSION=\"qmk_gcc\${CT_GCC_VERSION}\"" >>.config
+    echo "CT_TOOLCHAIN_PKGVERSION=\"qmk_toolchain-\${CT_GCC_VERSION}\"" >>.config
     ct-ng olddefconfig
 
     # Add the other compilers to the PATH for use in canadian builds

diff --git a/riscv32-native.sh b/riscv32-native.sh
@@ -6,10 +6,6 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ "$(uname -s)" == "Linux" ]]; then
-    extra_args="--static-toolchain"
-fi
-
 build_one \
     --sample-name=riscv32-picolibc-elf \
     --vendor-name=unknown \