diff --git a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro
index 9cf475fd..e23622d9 100644
--- a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro
+++ b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro
@@ -98,10 +98,12 @@ unix {
     contains(QT_ARCH, x86_64) {
         MY_ARCH = amd64
         MY_ARCH2 = x86_64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
     contains(QT_ARCH, arm64) {
         MY_ARCH = aarch64
         MY_ARCH2 = aarch64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
     contains(QT_ARCH, mips64) {
         MY_ARCH = mips64
@@ -110,11 +112,11 @@ unix {
     contains(QT_ARCH, loongarch64) {
         MY_ARCH = loongarch64
         MY_ARCH2 = loongarch64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
 
     CONFIG += unversioned_libname unversioned_soname
     QMAKE_CXXFLAGS += -fvisibility=hidden
-#    QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     QMAKE_LFLAGS += -Wl,-rpath,\'\$\$ORIGIN\' -Wl,--exclude-libs,ALL
     QMAKE_LFLAGS += -z defs -B direct
 
diff --git a/build2/qt/HGScanner2/HGScanner2.pro b/build2/qt/HGScanner2/HGScanner2.pro
index 688ecbeb..18e06cdc 100644
--- a/build2/qt/HGScanner2/HGScanner2.pro
+++ b/build2/qt/HGScanner2/HGScanner2.pro
@@ -105,11 +105,13 @@ unix {
         DEFINES += x86_64
         MY_ARCH = amd64
         MY_ARCH2 = x86_64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
     contains(QT_ARCH, arm64) {
         DEFINES += aarch64
         MY_ARCH = aarch64
         MY_ARCH2 = aarch64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
     contains(QT_ARCH, mips64) {
         DEFINES += mips64
@@ -120,11 +122,11 @@ unix {
         DEFINES += loongarch64
         MY_ARCH = loongarch64
         MY_ARCH2 = loongarch64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
 
     CONFIG += unversioned_libname unversioned_soname
     QMAKE_CXXFLAGS += -fvisibility=hidden
- #   QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     QMAKE_LFLAGS += -Wl,-rpath,\'\$\$ORIGIN\' -Wl,--exclude-libs,ALL
     QMAKE_LFLAGS += -z defs -B direct
 
diff --git a/build2/qt/HGTwainUI/HGTwainUI.pro b/build2/qt/HGTwainUI/HGTwainUI.pro
index 9a648723..52c7fa3d 100644
--- a/build2/qt/HGTwainUI/HGTwainUI.pro
+++ b/build2/qt/HGTwainUI/HGTwainUI.pro
@@ -73,10 +73,12 @@ unix {
     contains(QT_ARCH, x86_64) {
         MY_ARCH = amd64
         MY_ARCH2 = x86_64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
     contains(QT_ARCH, arm64) {
         MY_ARCH = aarch64
         MY_ARCH2 = aarch64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
     contains(QT_ARCH, mips64) {
         MY_ARCH = mips64
@@ -85,11 +87,11 @@ unix {
     contains(QT_ARCH, loongarch64) {
         MY_ARCH = loongarch64
         MY_ARCH2 = loongarch64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
 
     CONFIG += unversioned_libname unversioned_soname
     QMAKE_CXXFLAGS += -fvisibility=hidden
-  #  QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     QMAKE_LFLAGS += -Wl,-rpath,\'\$\$ORIGIN\' -Wl,--exclude-libs,ALL
     QMAKE_LFLAGS += -z defs -B direct
 
diff --git a/build2/qt/HGUpgrade/HGUpgrade.pro b/build2/qt/HGUpgrade/HGUpgrade.pro
index e9e61a39..17f4003e 100644
--- a/build2/qt/HGUpgrade/HGUpgrade.pro
+++ b/build2/qt/HGUpgrade/HGUpgrade.pro
@@ -93,10 +93,12 @@ unix {
     contains(QT_ARCH, x86_64) {
         MY_ARCH = amd64
         MY_ARCH2 = x86_64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
     contains(QT_ARCH, arm64) {
         MY_ARCH = aarch64
         MY_ARCH2 = aarch64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
     contains(QT_ARCH, mips64) {
         MY_ARCH = mips64
@@ -105,11 +107,11 @@ unix {
     contains(QT_ARCH, loongarch64) {
         MY_ARCH = loongarch64
         MY_ARCH2 = loongarch64
+        QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     }
 
     CONFIG += unversioned_libname unversioned_soname
     QMAKE_CXXFLAGS += -fvisibility=hidden
- #   QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
     QMAKE_LFLAGS += -Wl,-rpath,\'\$\$ORIGIN\' -Wl,--exclude-libs,ALL
     QMAKE_LFLAGS += -z defs -B direct