If at first we don't succeed, something something something.

qmk · Mar 4, 2024 · a0c28f6 · a0c28f6
1 parent 33e6816
commit a0c28f6
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 2 deletions.
diff --git a/aarch64linux-aarch64linux-canadian.sh b/aarch64linux-aarch64linux-canadian.sh
@@ -6,9 +6,12 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
+extra_args="--static-toolchain"
+
 build_one \
     --sample-name=aarch64-rpi3-linux-gnu \
     --canadian-host=aarch64-unknown-linux-gnu \
     --vendor-name=unknown \
     --no-cross-gdb-python \
+    ${extra_args:-} \
     "$@"
diff --git a/aarch64linux-native.sh b/aarch64linux-native.sh
@@ -6,8 +6,13 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
+if [[ "$(fn_os)" == "linux" ]]; then
+    extra_args="--static-toolchain"
+fi
+
 build_one \
     --sample-name=aarch64-rpi3-linux-gnu \
     --vendor-name=unknown \
     --no-cross-gdb-python \
+    ${extra_args:-} \
     "$@"
diff --git a/arm-aarch64linux-canadian.sh b/arm-aarch64linux-canadian.sh
@@ -11,6 +11,7 @@ build_one \
     --sample-name=arm-none-eabi \
     --multilib-list=rmprofile \
     --libc=newlib \
+    --binutils-plugins \
     --extra-newlib-nano \
     --no-cross-gdb-python \
     ${extra_args:-} \

diff --git a/arm-win64-canadian.sh b/arm-win64-canadian.sh
@@ -11,6 +11,7 @@ build_one \
     --sample-name=arm-none-eabi \
     --multilib-list=rmprofile \
     --libc=newlib \
+    --binutils-plugins \
     --extra-newlib-nano \
     --no-cross-gdb-python \
     ${extra_args:-} \

diff --git a/avr-aarch64linux-canadian.sh b/avr-aarch64linux-canadian.sh
@@ -9,5 +9,7 @@ build_one_help "$@"
 build_one \
     --sample-name=avr \
     --canadian-host=aarch64-unknown-linux-gnu \
+    --binutils-plugins \
     --no-cross-gdb-python \
-    "$@"
+    ${extra_args:-} \
+    "$@"
diff --git a/avr-win64-canadian.sh b/avr-win64-canadian.sh
@@ -9,5 +9,7 @@ build_one_help "$@"
 build_one \
     --sample-name=avr \
     --canadian-host=x86_64-w64-mingw32 \
+    --binutils-plugins \
     --no-cross-gdb-python \
-    "$@"
+    ${extra_args:-} \
+    "$@"
diff --git a/riscv32-aarch64linux-canadian.sh b/riscv32-aarch64linux-canadian.sh
@@ -10,5 +10,7 @@ build_one \
     --sample-name=riscv32-picolibc-elf \
     --vendor-name=unknown \
     --canadian-host=aarch64-unknown-linux-gnu \
+    --binutils-plugins \
     --no-cross-gdb-python \
+    ${extra_args:-} \
     "$@"
diff --git a/riscv32-win64-canadian.sh b/riscv32-win64-canadian.sh
@@ -10,5 +10,7 @@ build_one \
     --sample-name=riscv32-picolibc-elf \
     --vendor-name=unknown \
     --canadian-host=x86_64-w64-mingw32 \
+    --binutils-plugins \
     --no-cross-gdb-python \
+    ${extra_args:-} \
     "$@"
diff --git a/win64-native.sh b/win64-native.sh
@@ -6,7 +6,12 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
+if [[ "$(fn_os)" == "linux" ]]; then
+    extra_args="--static-toolchain"
+fi
+
 build_one \
     --sample-name=x86_64-w64-mingw32 \
     --no-cross-gdb-python \
+    ${extra_args:-} \
     "$@"
diff --git a/win64-win64-canadian.sh b/win64-win64-canadian.sh
@@ -10,4 +10,5 @@ build_one \
     --sample-name=x86_64-w64-mingw32 \
     --canadian-host=x86_64-w64-mingw32 \
     --no-cross-gdb-python \
+    ${extra_args:-} \
     "$@"
diff --git a/x64linux-native.sh b/x64linux-native.sh
@@ -6,7 +6,12 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
+if [[ "$(fn_os)" == "linux" ]]; then
+    extra_args="--static-toolchain"
+fi
+
 build_one \
     --sample-name=x86_64-unknown-linux-gnu \
     --no-cross-gdb-python \
+    ${extra_args:-} \
     "$@"