Canadian toolchains don't need bootstrap toolchain override.

qmk · Mar 7, 2024 · 2f13b24 · 2f13b24
1 parent a394417
commit 2f13b24
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 40 deletions.
diff --git a/aarch64linux-aarch64linux-canadian.sh b/aarch64linux-aarch64linux-canadian.sh
@@ -6,14 +6,9 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ $(uname -s) == "Linux" ]]; then
-    extra_args="--tools-prefix=x86_64-qmk_bootstrap-linux-gnu-"
-fi
-
 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/arm-aarch64linux-canadian.sh b/arm-aarch64linux-canadian.sh
@@ -6,10 +6,6 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ $(uname -s) == "Linux" ]]; then
-    extra_args="--tools-prefix=x86_64-qmk_bootstrap-linux-gnu-"
-fi
-
 build_one \
     --canadian-host=aarch64-unknown-linux-gnu \
     --sample-name=arm-none-eabi \
@@ -18,5 +14,4 @@ build_one \
     --binutils-plugins \
     --extra-newlib-nano \
     --no-cross-gdb-python \
-    ${extra_args:-} \
     "$@"
diff --git a/arm-win64-canadian.sh b/arm-win64-canadian.sh
@@ -6,10 +6,6 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ $(uname -s) == "Linux" ]]; then
-    extra_args="--tools-prefix=x86_64-qmk_bootstrap-linux-gnu-"
-fi
-
 build_one \
     --canadian-host=x86_64-w64-mingw32 \
     --sample-name=arm-none-eabi \
@@ -18,5 +14,4 @@ build_one \
     --binutils-plugins \
     --extra-newlib-nano \
     --no-cross-gdb-python \
-    ${extra_args:-} \
     "$@"
diff --git a/avr-aarch64linux-canadian.sh b/avr-aarch64linux-canadian.sh
@@ -6,14 +6,9 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ $(uname -s) == "Linux" ]]; then
-    extra_args="--tools-prefix=x86_64-qmk_bootstrap-linux-gnu-"
-fi
-
 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
@@ -6,14 +6,9 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ $(uname -s) == "Linux" ]]; then
-    extra_args="--tools-prefix=x86_64-qmk_bootstrap-linux-gnu-"
-fi
-
 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
@@ -6,15 +6,10 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ $(uname -s) == "Linux" ]]; then
-    extra_args="--tools-prefix=x86_64-qmk_bootstrap-linux-gnu-"
-fi
-
 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
@@ -6,15 +6,10 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ $(uname -s) == "Linux" ]]; then
-    extra_args="--tools-prefix=x86_64-qmk_bootstrap-linux-gnu-"
-fi
-
 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-win64-canadian.sh b/win64-win64-canadian.sh
@@ -6,13 +6,8 @@ source "${script_dir}/common.bashinc"
 
 build_one_help "$@"
 
-if [[ $(uname -s) == "Linux" ]]; then
-    extra_args="--tools-prefix=x86_64-qmk_bootstrap-linux-gnu-"
-fi
-
 build_one \
     --sample-name=x86_64-w64-mingw32 \
     --canadian-host=x86_64-w64-mingw32 \
     --no-cross-gdb-python \
-    ${extra_args:-} \
     "$@"