diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf
index db95b529c..9eb441d0c 100644
--- a/mkspecs/features/common_pre.prf
+++ b/mkspecs/features/common_pre.prf
@@ -192,7 +192,7 @@ defineTest(addLibraryDependency) {
     }
     else {
         win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/$${1}.lib
-        win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.a
+        win32:gcc:  PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.a
         linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.so
         macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.dylib
         export(PRE_TARGETDEPS)
@@ -210,7 +210,12 @@ msvc:contains(QMAKE_CXXFLAGS, /permissive-): QMAKE_CXXFLAGS *= /FI$${SourceRoot}
 # Experimental support for Clang on Windows
 ################################
 
-clang_cl {
+win32:llvm {
+    mingw {
+        equals(WORD_SIZE,32): QMAKE_CXXFLAGS += --target=i686-pc-windows-gnu
+        equals(WORD_SIZE,64): QMAKE_CXXFLAGS += --target=x86_64-pc-windows-gnu
+    }
+
     # Address Sanitizer
     # https://stackoverflow.com/a/48585886/1639256
     # http://lists.llvm.org/pipermail/cfe-dev/2016-April/048288.html
diff --git a/mkspecs/features/externals.pri b/mkspecs/features/externals.pri
index 441506842..f32c54196 100644
--- a/mkspecs/features/externals.pri
+++ b/mkspecs/features/externals.pri
@@ -21,9 +21,10 @@ isEmpty(EXTERNALSROOT) {
 # Externals
 ################################
 
-win32-clang-msvc: EXTERNALS_SPEC = win32-msvc
-else:linux:       EXTERNALS_SPEC = linux-g++
-else:             EXTERNALS_SPEC = $$basename(QMAKESPEC)
+win32-clang-msvc:       EXTERNALS_SPEC = win32-msvc
+else:win32-clang-g++:   EXTERNALS_SPEC = win32-g++
+else:linux:             EXTERNALS_SPEC = linux-g++
+else:                   EXTERNALS_SPEC = $$basename(QMAKESPEC)
 
 msvc {
     INCLUDEPATH *= $$EXTERNALSROOT/common/include
diff --git a/mkspecs/features/wordsize.pri b/mkspecs/features/wordsize.pri
index 80ffcb7f6..b98ae26cb 100644
--- a/mkspecs/features/wordsize.pri
+++ b/mkspecs/features/wordsize.pri
@@ -41,3 +41,8 @@ macx-clang {
     # TODO
     WORD_SIZE = 64
 }
+
+win32-clang-g++ {
+    # TODO
+    WORD_SIZE = 64
+}