move inclusions of unix.conf (and related files) near the top

that way we can override the values defined there.

Change-Id: Ib9bce596d9fd43875b26a97c5489ee9d0d46b77c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

7 files changed, 14 insertions, 7 deletions

diff --git a/mkspecs/unsupported/freebsd-clang/qmake.conf b/mkspecs/unsupported/freebsd-clang/qmake.conf
index 92b7c47590..9d9815a7b3 100644
--- a/mkspecs/unsupported/freebsd-clang/qmake.conf
+++ b/mkspecs/unsupported/freebsd-clang/qmake.conf
@@ -5,6 +5,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = freebsd bsd
 
+include(../common/unix.conf)
+
 QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
 
 QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
@@ -28,7 +30,7 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../../common/unix.conf)
 include(../../common/gcc-base-unix.conf)
 include(../../common/clang.conf)
+
 load(qt_config)
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 546ff21349..3aa7520776 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -17,6 +17,8 @@ QMAKE_PLATFORM          = linux
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
+include(../common/unix.conf)
+
 #
 # qmake configuration for common gcc
 #
@@ -111,5 +113,4 @@ QMAKE_RANLIB            =
 QMAKE_STRIP             = host-strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 
-include(../../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/unsupported/qnx-X11-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index 8d2c63f330..79a5609dbf 100644
--- a/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -7,9 +7,9 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = qnx
 
+include(../common/unix.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
-include(../common/unix.conf)
 
 QMAKE_CFLAGS_THREAD     = -D_REENTRANT
 QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CLFAGS_THREAD
diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
index a4cf23df9c..16e3127803 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -7,6 +7,8 @@ QMAKE_PLATFORM          = vxworks
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
+include(../common/unix.conf)
+
 VXWORKS_ARCH            = ppc
 VXWORKS_CPU             = PPC32
 VXWORKS_DIAB_SPEC       = -tPPC7400FV:vxworks66
@@ -88,6 +90,5 @@ QMAKE_RANLIB            =
 QMAKE_STRIP             = strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 
-include(../../common/unix.conf)
 load(qt_config)
 
diff --git a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
index 1d3e9f4eb4..49cacdba43 100644
--- a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
@@ -8,13 +8,14 @@ CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 DEFINES                += VXWORKS
 
+include(../../common/linux.conf)
+
 VXWORKS_ARCH            = ppc
 VXWORKS_CPU             = PPC32
 VXWORKS_ARCH_MUNCH      = ppc
 
 include(../../common/gcc-base-unix.conf)
 include(../../common/g++-unix.conf)
-include(../../common/linux.conf)
 
 QMAKE_CC                = cc$$VXWORKS_ARCH_MUNCH
 QMAKE_CFLAGS            = -fno-builtin -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=gnu -DTOOL=gnu -D_WRS_KERNEL -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
index 49f0c21d4a..44e39a8a8c 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -7,6 +7,8 @@ QMAKE_PLATFORM          = vxworks
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
+include(../common/unix.conf)
+
 VXWORKS_ARCH            = simlinux
 VXWORKS_CPU             = SIMLINUX
 VXWORKS_DIAB_SPEC       = -tX86LH:vxworks66
@@ -87,6 +89,5 @@ QMAKE_RANLIB            =
 QMAKE_STRIP             = strip
 QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 
-include(../../common/unix.conf)
 load(qt_config)
 
diff --git a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
index 3c8fd12d4a..4d5cc97fad 100644
--- a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
@@ -8,13 +8,14 @@ CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 DEFINES                += VXWORKS
 
+include(../../common/linux.conf)
+
 VXWORKS_ARCH            = simlinux
 VXWORKS_CPU             = SIMLINUX
 VXWORKS_ARCH_MUNCH      = pentium
 
 include(../../common/gcc-base-unix.conf)
 include(../../common/g++-unix.conf)
-include(../../common/linux.conf)
 
 QMAKE_CC                = cc$$VXWORKS_ARCH_MUNCH
 QMAKE_CFLAGS            = -fno-builtin -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=gnu -DTOOL=gnu -D_WRS_KERNEL -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'