Update for custom arm toolchain

tools/linux/arm/cross_arm64/.gitignore

@@ -1,3 +1,5 @@
 qt_source*
 qt_binary*
-qt-*
+qt_build*
+qt-*
+gcc-linaro-*

tools/linux/arm/cross_arm64/build_qt.py

@@ -1,10 +1,44 @@
+#!/usr/bin/env python
+
 import sys
 import os
 sys.path.append('../../../../scripts')
 
 import base
 
-def make():
+def update_qmake_conf(arm_toolchain_bin):
+  replace_file = "./qt-everywhere-src-5.15.2/qtbase/mkspecs/linux-aarch64-gnu-g++/qmake.conf"
+  arm_toolchain_bin = os.path.abspath(arm_toolchain_bin)
+  
+  replace_src = ""
+  replace_src += "# modifications to g++.conf\n"
+  replace_src += "QMAKE_CC                = aarch64-linux-gnu-gcc\n"
+  replace_src += "QMAKE_CXX               = aarch64-linux-gnu-g++\n"
+  replace_src += "QMAKE_LINK              = aarch64-linux-gnu-g++\n"
+  replace_src += "QMAKE_LINK_SHLIB        = aarch64-linux-gnu-g++\n"
+  replace_src += "\n"
+  replace_src += "# modifications to linux.conf\n"
+  replace_src += "QMAKE_AR                = aarch64-linux-gnu-ar cqs\n"
+  replace_src += "QMAKE_OBJCOPY           = aarch64-linux-gnu-objcopy\n"
+  replace_src += "QMAKE_NM                = aarch64-linux-gnu-nm -P\n"
+  replace_src += "QMAKE_STRIP             = aarch64-linux-gnu-strip\n"
+  
+  replace_dst = ""
+  replace_dst += "# modifications to g++.conf\n"
+  replace_dst += "QMAKE_CC                = " + arm_toolchain_bin + "/aarch64-linux-gnu-gcc\n"
+  replace_dst += "QMAKE_CXX               = " + arm_toolchain_bin + "/aarch64-linux-gnu-g++\n"
+  replace_dst += "QMAKE_LINK              = " + arm_toolchain_bin + "/aarch64-linux-gnu-g++\n"
+  replace_dst += "QMAKE_LINK_SHLIB        = " + arm_toolchain_bin + "/aarch64-linux-gnu-g++\n"
+  replace_dst += "\n"
+  replace_dst += "# modifications to linux.conf\n"
+  replace_dst += "QMAKE_AR                = " + arm_toolchain_bin + "/aarch64-linux-gnu-ar cqs\n"
+  replace_dst += "QMAKE_OBJCOPY           = " + arm_toolchain_bin + "/aarch64-linux-gnu-objcopy\n"
+  replace_dst += "QMAKE_NM                = " + arm_toolchain_bin + "/aarch64-linux-gnu-nm -P\n"
+  replace_dst += "QMAKE_STRIP             = " + arm_toolchain_bin + "/aarch64-linux-gnu-strip\n"
+  
+  base.replaceInFile(replace_file, replace_src, replace_dst)
+
+def make(arm_toolchain_bin=""):
   qt_build_path = os.path.dirname(os.path.abspath(__file__)) + "/qt_build/Qt-5.15.2/linux_arm64"
   qt_params = ["-opensource",
     "-confirm-license",
@@ -53,10 +87,17 @@ def make():
   if filedata.find(additional_gcc_11) == -1:
     filedata = additional_gcc_11 + filedata
     base.writeFile(chanage_file, filedata)
+    
+  if arm_toolchain_bin != "":
+    update_qmake_conf(arm_toolchain_bin)
 
   base.cmd_in_dir("./qt-everywhere-src-5.15.2", "./configure " + qt_params_str)
   base.cmd_in_dir("./qt-everywhere-src-5.15.2", "make -j4")
   base.cmd_in_dir("./qt-everywhere-src-5.15.2", "make install")
   
 if __name__ == "__main__":
-  make()
+  arm_toolchain_path = "./gcc-linaro-5.4.1-2017.05-x86_64_aarch64-linux-gnu/bin"
+  if len(sys.argv) != 1:
+    arm_toolchain_path = sys.argv[1]
+    
+  make(arm_toolchain_path)

tools/linux/arm/cross_arm64/download_arm_toolchain.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+import sys
+import os
+sys.path.append('../../../../scripts')
+
+import base
+
+def make():
+    arm_toolchain_url = 'https://releases.linaro.org/components/toolchain/binaries/5.4-2017.05/aarch64-linux-gnu/'
+    arm_toolchain_tar_filename = 'gcc-linaro-5.4.1-2017.05-x86_64_aarch64-linux-gnu.tar.xz'
+    base.cmd2('wget', [arm_toolchain_url + arm_toolchain_tar_filename])
+    base.cmd2('tar', ['-xf', arm_toolchain_tar_filename])
+
+if __name__ == "__main__":
+	make()

tools/linux/arm/cross_arm64/fetch_qt.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 import sys
 import os
 sys.path.append('../../../scripts')

tools/win/arm64/.gitignore

@@ -1,4 +1,5 @@
 tmp.bat
 qt_source*
 qt_binary*
-qt-*
+qt_build*
+qt-*