toolchain: Use the prebuilt x86_64-none-linux-gnu GCC instead of host…

… gcc.

Signed-off-by: Shanmin Zhang <[email protected]>

arch/x86_64/src/common/Toolchain.defs

@@ -72,11 +72,15 @@ ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
 # Cygwin toolchains don't generate ELF binaries.
 
 ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
-CROSSDEV = i486-nuttx-elf-
+CROSSDEV = x86_64-none-linux-gnu-
 endif
 
 ifeq ($(CONFIG_HOST_MACOS),y)
-CROSSDEV = x86_64-elf-
+CROSSDEV = x86_64-none-linux-gnu-
+endif
+
+ifeq ($(CONFIG_HOST_LINUX),y)
+CROSSDEV = x86_64-none-linux-gnu-
 endif
 
 ifneq ($(CONFIG_CXX_STANDARD),)

tools/build.sh

@@ -163,8 +163,6 @@ function setup_environment()
     fi
   done
 
-  echo " sudo apt-get install -y software-properties-common"
-  echo " sudo add-apt-repository ppa:ubuntu-toolchain-r/test"
   echo " sudo apt-get update"
   echo " sudo apt-get install -y ${INSTALLS[@]}"
   echo ""
@@ -233,6 +231,9 @@ function setup_toolchain()
       elif [ -d ${ROOTDIR}/prebuilts/${TOOLCHAIN[$j]}/${SYSTEM}/${ARCH[$i]}/bin ]; then
         export PATH=${ROOTDIR}/prebuilts/${TOOLCHAIN[$j]}/${SYSTEM}/${ARCH[$i]}/bin:$PATH
       fi
+      if [ -d ${ROOTDIR}/prebuilts/${TOOLCHAIN[$j]}/${SYSTEM}-${SYS_ARCH}/${ARCH[$i]}-none-linux-gnu/bin ]; then
+        export PATH=${ROOTDIR}/prebuilts/${TOOLCHAIN[$j]}/${SYSTEM}-${SYS_ARCH}/${ARCH[$i]}-none-linux-gnu/bin:$PATH
+      fi
     done
   done