From 3e6d1726380326c0faba9029e2a68886595a2ebc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 29 Sep 2015 12:39:08 +0200 Subject: [PATCH] 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 --- mkspecs/aix-g++-64/qmake.conf | 3 ++- mkspecs/aix-g++/qmake.conf | 3 ++- mkspecs/aix-xlc-64/qmake.conf | 3 ++- mkspecs/aix-xlc/qmake.conf | 3 ++- mkspecs/common/linux.conf | 4 ++-- mkspecs/common/mac.conf | 4 ++-- mkspecs/common/qcc-base-qnx-armle-v7.conf | 3 ++- mkspecs/common/qcc-base-qnx-x86.conf | 3 ++- mkspecs/darwin-g++/qmake.conf | 3 ++- mkspecs/freebsd-g++/qmake.conf | 3 ++- mkspecs/freebsd-g++46/qmake.conf | 3 ++- mkspecs/freebsd-icc/qmake.conf | 3 ++- mkspecs/haiku-g++/qmake.conf | 4 +++- mkspecs/hpux-acc-64/qmake.conf | 3 ++- mkspecs/hpux-acc-o64/qmake.conf | 3 ++- mkspecs/hpux-acc/qmake.conf | 3 ++- mkspecs/hpux-g++-64/qmake.conf | 3 ++- mkspecs/hpux-g++/qmake.conf | 3 ++- mkspecs/hpuxi-acc-32/qmake.conf | 3 ++- mkspecs/hpuxi-acc-64/qmake.conf | 3 ++- mkspecs/hpuxi-g++-64/qmake.conf | 3 ++- mkspecs/hurd-g++/qmake.conf | 3 ++- mkspecs/irix-cc-64/qmake.conf | 3 ++- mkspecs/irix-cc/qmake.conf | 3 ++- mkspecs/irix-g++-64/qmake.conf | 3 ++- mkspecs/irix-g++/qmake.conf | 3 ++- mkspecs/linux-cxx/qmake.conf | 3 ++- mkspecs/linux-g++-32/qmake.conf | 4 +++- mkspecs/linux-g++-64/qmake.conf | 3 ++- mkspecs/linux-kcc/qmake.conf | 3 ++- mkspecs/linux-pgcc/qmake.conf | 3 ++- mkspecs/lynxos-g++/qmake.conf | 3 ++- mkspecs/netbsd-g++/qmake.conf | 3 ++- mkspecs/openbsd-g++/qmake.conf | 3 ++- mkspecs/sco-g++/qmake.conf | 3 ++- mkspecs/solaris-cc-64/qmake.conf | 3 ++- mkspecs/solaris-cc/qmake.conf | 3 ++- mkspecs/solaris-g++-64/qmake.conf | 3 ++- mkspecs/solaris-g++/qmake.conf | 3 ++- mkspecs/tru64-cxx/qmake.conf | 3 ++- mkspecs/tru64-g++/qmake.conf | 3 ++- mkspecs/unixware-cc/qmake.conf | 3 ++- mkspecs/unixware-g++/qmake.conf | 3 ++- mkspecs/unsupported/freebsd-clang/qmake.conf | 4 +++- mkspecs/unsupported/linux-host-g++/qmake.conf | 3 ++- mkspecs/unsupported/qnx-X11-g++/qmake.conf | 2 +- mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf | 3 ++- mkspecs/unsupported/vxworks-ppc-g++/qmake.conf | 3 ++- mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf | 3 ++- mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf | 3 ++- 50 files changed, 102 insertions(+), 52 deletions(-) diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf index 176c437c459..7f620a9577d 100644 --- a/mkspecs/aix-g++-64/qmake.conf +++ b/mkspecs/aix-g++-64/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = aix +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -67,5 +69,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = ranlib -X64 -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf index 553d9af5447..d2f26a1b415 100644 --- a/mkspecs/aix-g++/qmake.conf +++ b/mkspecs/aix-g++/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = aix +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -67,5 +69,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf index 42dbd18b4a9..1aea8d81c50 100644 --- a/mkspecs/aix-xlc-64/qmake.conf +++ b/mkspecs/aix-xlc-64/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = aix +include(../common/unix.conf) + QMAKE_COMPILER = ibm_xlc QMAKE_CC = xlc @@ -66,5 +68,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = ranlib -X64 -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf index d2de649355d..c765d4ff6b1 100644 --- a/mkspecs/aix-xlc/qmake.conf +++ b/mkspecs/aix-xlc/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = aix +include(../common/unix.conf) + QMAKE_COMPILER = ibm_xlc QMAKE_CC = xlc @@ -69,5 +71,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = ranlib -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index 8d6fb6fe171..b98d9bdf2dd 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -4,6 +4,8 @@ QMAKE_PLATFORM += linux +include(unix.conf) + QMAKE_CFLAGS_THREAD += -D_REENTRANT QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections @@ -51,5 +53,3 @@ QMAKE_RANLIB = QMAKE_STRIP = strip QMAKE_STRIPFLAGS_LIB += --strip-unneeded - -include(unix.conf) diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 91639ddb50e..d80b41c74b0 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -6,6 +6,8 @@ QMAKE_PLATFORM += mac darwin +include(unix.conf) + QMAKE_RESOURCE = /Developer/Tools/Rez QMAKE_EXTENSION_SHLIB = dylib QMAKE_LIBDIR = @@ -27,5 +29,3 @@ QMAKE_LIBS_THREAD = QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s QMAKE_NM = nm -P - -include(unix.conf) diff --git a/mkspecs/common/qcc-base-qnx-armle-v7.conf b/mkspecs/common/qcc-base-qnx-armle-v7.conf index 12d393f0705..ad3bb33da4a 100644 --- a/mkspecs/common/qcc-base-qnx-armle-v7.conf +++ b/mkspecs/common/qcc-base-qnx-armle-v7.conf @@ -4,9 +4,10 @@ MAKEFILE_GENERATOR = UNIX -include(g++-unix.conf) include(unix.conf) +include(g++-unix.conf) + QMAKE_CC = qcc -Vgcc_ntoarmv7le QMAKE_CXX = qcc -Vgcc_ntoarmv7le QNX_CPUDIR = armle-v7 diff --git a/mkspecs/common/qcc-base-qnx-x86.conf b/mkspecs/common/qcc-base-qnx-x86.conf index b49075086d3..37a5d9ce704 100644 --- a/mkspecs/common/qcc-base-qnx-x86.conf +++ b/mkspecs/common/qcc-base-qnx-x86.conf @@ -4,9 +4,10 @@ MAKEFILE_GENERATOR = UNIX -include(g++-unix.conf) include(unix.conf) +include(g++-unix.conf) + QMAKE_CC = qcc -Vgcc_ntox86 QMAKE_CXX = qcc -Vgcc_ntox86 QNX_CPUDIR = x86 diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf index ab333b16845..79f81a990f8 100644 --- a/mkspecs/darwin-g++/qmake.conf +++ b/mkspecs/darwin-g++/qmake.conf @@ -9,6 +9,8 @@ QMAKE_PLATFORM = osx macx mac darwin CONFIG += native_precompiled_headers DEFINES += __USE_WS_X11__ +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = cc @@ -84,5 +86,4 @@ QMAKE_PCH_OUTPUT_EXT = .gch QMAKE_CXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index 47505fc06a5..282b6bdfa7c 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/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 @@ -27,7 +29,6 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) load(qt_config) diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf index 277997ab286..b930fca78b5 100644 --- a/mkspecs/freebsd-g++46/qmake.conf +++ b/mkspecs/freebsd-g++46/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 @@ -27,7 +29,6 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf index fb419f7e5b8..d72ea732786 100644 --- a/mkspecs/freebsd-icc/qmake.conf +++ b/mkspecs/freebsd-icc/qmake.conf @@ -30,6 +30,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = freebsd bsd +include(../common/unix.conf) + QMAKE_COMPILER = gcc intel_icc # icc pretends to be gcc QMAKE_CC = icc @@ -90,5 +92,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/haiku-g++/qmake.conf b/mkspecs/haiku-g++/qmake.conf index 61443923850..ac280698643 100644 --- a/mkspecs/haiku-g++/qmake.conf +++ b/mkspecs/haiku-g++/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = haiku +include(../common/unix.conf) + # Choose haiku QPA Plugin as default QT_QPA_DEFAULT_PLATFORM = haiku @@ -23,5 +25,5 @@ QMAKE_RANLIB = include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) -include(../common/unix.conf) + load(qt_config) diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf index 2156b448fe3..f0b879de837 100644 --- a/mkspecs/hpux-acc-64/qmake.conf +++ b/mkspecs/hpux-acc-64/qmake.conf @@ -49,6 +49,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux QMAKE_COMPILER_DEFINES += __hpux __HP_aCC +include(../common/unix.conf) + QMAKE_COMPILER = hp_acc QMAKE_CC = cc @@ -111,5 +113,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf index 69c3df1375d..750bb991557 100644 --- a/mkspecs/hpux-acc-o64/qmake.conf +++ b/mkspecs/hpux-acc-o64/qmake.conf @@ -48,6 +48,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux +include(../common/unix.conf) + QMAKE_COMPILER = hp_acc QMAKE_CC = cc @@ -109,5 +111,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf index eaa8888fbef..2f1ce1054c3 100644 --- a/mkspecs/hpux-acc/qmake.conf +++ b/mkspecs/hpux-acc/qmake.conf @@ -28,6 +28,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux QMAKE_COMPILER_DEFINES += __hpux __HP_aCC +include(../common/unix.conf) + QMAKE_COMPILER = hp_acc QMAKE_CC = cc @@ -90,5 +92,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf index 3e822edbfba..a27333fa180 100644 --- a/mkspecs/hpux-g++-64/qmake.conf +++ b/mkspecs/hpux-g++-64/qmake.conf @@ -8,6 +8,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -73,5 +75,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf index 866a3416bcb..b488da71788 100644 --- a/mkspecs/hpux-g++/qmake.conf +++ b/mkspecs/hpux-g++/qmake.conf @@ -9,6 +9,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux CONFIG += plugin_no_soname +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -74,5 +76,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf index 79bf20fbb2a..e80a7973fe7 100644 --- a/mkspecs/hpuxi-acc-32/qmake.conf +++ b/mkspecs/hpuxi-acc-32/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux CONFIG += plugin_no_soname +include(../common/unix.conf) + QMAKE_COMPILER = hp_acc QMAKE_CC = cc @@ -66,5 +68,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf index aaec3eab146..360e35c5d6d 100644 --- a/mkspecs/hpuxi-acc-64/qmake.conf +++ b/mkspecs/hpuxi-acc-64/qmake.conf @@ -49,6 +49,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux CONFIG += plugin_no_soname +include(../common/unix.conf) + QMAKE_COMPILER = hp_acc QMAKE_CC = cc @@ -109,5 +111,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf index 8a05a5f6119..4c376de7193 100644 --- a/mkspecs/hpuxi-g++-64/qmake.conf +++ b/mkspecs/hpuxi-g++-64/qmake.conf @@ -13,6 +13,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hpux +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -76,5 +78,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf index e7e4e3a82d0..f2e32426273 100644 --- a/mkspecs/hurd-g++/qmake.conf +++ b/mkspecs/hurd-g++/qmake.conf @@ -7,6 +7,8 @@ QMAKE_PLATFORM += hurd CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib +include(../common/unix.conf) + QMAKE_CFLAGS_THREAD += -D_REENTRANT QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections @@ -46,7 +48,6 @@ QMAKE_RANLIB = QMAKE_STRIP = strip QMAKE_STRIPFLAGS_LIB += --strip-unneeded -include(../common/unix.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) load(qt_config) diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf index 05c8b6fc84d..ad5c6a3ee15 100644 --- a/mkspecs/irix-cc-64/qmake.conf +++ b/mkspecs/irix-cc-64/qmake.conf @@ -38,6 +38,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = irix QMAKE_COMPILER_DEFINES += __sgi __EDG +include(../common/unix.conf) + QMAKE_COMPILER = sgi_cc QMAKE_CC = cc @@ -103,5 +105,4 @@ QMAKE_RANLIB = QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf index 72d4e654743..52abdf8578b 100644 --- a/mkspecs/irix-cc/qmake.conf +++ b/mkspecs/irix-cc/qmake.conf @@ -38,6 +38,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = irix QMAKE_COMPILER_DEFINES += __sgi __EDG +include(../common/unix.conf) + QMAKE_COMPILER = sgi_cc QMAKE_CC = cc @@ -103,5 +105,4 @@ QMAKE_RANLIB = QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf index 12c224b5c08..bd258df5e87 100644 --- a/mkspecs/irix-g++-64/qmake.conf +++ b/mkspecs/irix-g++-64/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = irix QMAKE_COMPILER_DEFINES += __sgi __GNUC__ +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -73,5 +75,4 @@ QMAKE_RANLIB = QMAKE_CLEAN = so_locations -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf index 2c02165e0d7..57a27b6a1be 100644 --- a/mkspecs/irix-g++/qmake.conf +++ b/mkspecs/irix-g++/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = irix QMAKE_COMPILER_DEFINES += __sgi __GNUC__ +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -73,5 +75,4 @@ QMAKE_RANLIB = QMAKE_CLEAN = so_locations -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf index 1c7cafc6f23..b156bea0847 100644 --- a/mkspecs/linux-cxx/qmake.conf +++ b/mkspecs/linux-cxx/qmake.conf @@ -7,6 +7,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = linux +include(../common/unix.conf) + QMAKE_COMPILER = compaq_cc QMAKE_CC = ccc @@ -61,5 +63,4 @@ QMAKE_LIBS_OPENGL = -lGL QMAKE_AR = ar cqs QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf index 340aa85e7c4..f09abeeec0b 100644 --- a/mkspecs/linux-g++-32/qmake.conf +++ b/mkspecs/linux-g++-32/qmake.conf @@ -6,10 +6,12 @@ MAKEFILE_GENERATOR = UNIX CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib +include(../common/linux.conf) + QMAKE_CFLAGS = -m32 QMAKE_LFLAGS = -m32 -include(../common/linux.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) + load(qt_config) diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf index 36fb6a83eb0..a79b69ff31f 100644 --- a/mkspecs/linux-g++-64/qmake.conf +++ b/mkspecs/linux-g++-64/qmake.conf @@ -9,10 +9,11 @@ MAKEFILE_GENERATOR = UNIX CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib +include(../common/linux.conf) + QMAKE_CFLAGS = -m64 QMAKE_LFLAGS = -m64 -include(../common/linux.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf index 06efc8c12c8..591a59537f7 100644 --- a/mkspecs/linux-kcc/qmake.conf +++ b/mkspecs/linux-kcc/qmake.conf @@ -16,6 +16,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = linux +include(../common/unix.conf) + QMAKE_COMPILER = kai_cc QMAKE_CC = KCC @@ -78,5 +80,4 @@ QMAKE_RANLIB = QMAKE_CLEAN = -r $(OBJECTS_DIR)ti_files -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf index 286f937b0e9..c41823ba947 100644 --- a/mkspecs/linux-pgcc/qmake.conf +++ b/mkspecs/linux-pgcc/qmake.conf @@ -7,6 +7,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = linux +include(../common/unix.conf) + QMAKE_COMPILER = portland_cc QMAKE_CC = pgcc @@ -67,5 +69,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf index a53d6a8ec74..91bcc6b85d3 100644 --- a/mkspecs/lynxos-g++/qmake.conf +++ b/mkspecs/lynxos-g++/qmake.conf @@ -9,6 +9,8 @@ QMAKE_PLATFORM = lynxos CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -74,5 +76,4 @@ QMAKE_RANLIB = QMAKE_STRIP = strip QMAKE_STRIPFLAGS_LIB += --strip-unneeded -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index 6cb24d9bf9a..04c675da24c 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = netbsd bsd +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -68,5 +70,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = ranlib -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf index 2fdbd2c4698..10330bc0815 100644 --- a/mkspecs/openbsd-g++/qmake.conf +++ b/mkspecs/openbsd-g++/qmake.conf @@ -5,6 +5,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = openbsd bsd +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -69,5 +71,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = ranlib -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf index ebf60a39547..27fc1cffe31 100644 --- a/mkspecs/sco-g++/qmake.conf +++ b/mkspecs/sco-g++/qmake.conf @@ -7,6 +7,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = sco +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -65,5 +67,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index 6e1d35ef437..1c7b43c29ce 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf @@ -24,6 +24,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris +include(../common/unix.conf) + QMAKE_COMPILER = sun_cc QMAKE_CC = cc @@ -90,5 +92,4 @@ QMAKE_RANLIB = QMAKE_CLEAN = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index 23814135b67..045ab033dd1 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf @@ -7,6 +7,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris +include(../common/unix.conf) + QMAKE_COMPILER = sun_cc QMAKE_CC = cc @@ -73,5 +75,4 @@ QMAKE_RANLIB = QMAKE_CLEAN = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf index 34fd044f3e1..91ffb9193ee 100644 --- a/mkspecs/solaris-g++-64/qmake.conf +++ b/mkspecs/solaris-g++-64/qmake.conf @@ -28,6 +28,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -92,5 +94,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf index ccc178395ba..594646353d7 100644 --- a/mkspecs/solaris-g++/qmake.conf +++ b/mkspecs/solaris-g++/qmake.conf @@ -11,6 +11,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -75,5 +77,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf index a2e01126236..024590bf914 100644 --- a/mkspecs/tru64-cxx/qmake.conf +++ b/mkspecs/tru64-cxx/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = tru64 CONFIG += plugin_no_soname +include(../common/unix.conf) + QMAKE_COMPILER = dec_cc QMAKE_CC = cc @@ -65,5 +67,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf index dd7eb6c9c38..193e2694eac 100644 --- a/mkspecs/tru64-g++/qmake.conf +++ b/mkspecs/tru64-g++/qmake.conf @@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = tru64 CONFIG += plugin_no_soname +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -67,5 +69,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf index 483b8c0bb35..1a36a3e76bc 100644 --- a/mkspecs/unixware-cc/qmake.conf +++ b/mkspecs/unixware-cc/qmake.conf @@ -10,6 +10,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = unixware +include(../common/unix.conf) + QMAKE_COMPILER = sco_cc QMAKE_CC = cc @@ -69,5 +71,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf index feca5a4c9e3..abe2773debe 100644 --- a/mkspecs/unixware-g++/qmake.conf +++ b/mkspecs/unixware-g++/qmake.conf @@ -7,6 +7,8 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = unixware +include(../common/unix.conf) + QMAKE_COMPILER = gcc QMAKE_CC = gcc @@ -68,5 +70,4 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../common/unix.conf) load(qt_config) diff --git a/mkspecs/unsupported/freebsd-clang/qmake.conf b/mkspecs/unsupported/freebsd-clang/qmake.conf index 92b7c475902..9d9815a7b3b 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 546ff213498..3aa75207761 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 8d2c63f3307..79a5609dbf3 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 a4cf23df9c1..16e3127803e 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 1d3e9f4eb47..49cacdba433 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 49f0c21d4a6..44e39a8a8c4 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 3c8fd12d4a7..4d5cc97fad0 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>\'