summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2020-06-08 14:16:55 +0300
committerOrgad Shaneh <orgad.shaneh@audiocodes.com>2020-07-06 16:44:11 +0300
commit04739ce4b401bdfe766e64deac1bb382ddd954cc (patch)
tree347c1ec5724b9162d6b31f04e5d5da10c3a4538a /mkspecs
parentde307a8ecea92a86c8807a3a4016a012b66008c9 (diff)
Qmake: Share QMAKE_LINK_OBJECT_SCRIPT definition
It is only used by default on Windows, but can be enabled by setting QMAKE_LINK_OBJECT_MAX. The current file name is .project_name. Use a sensible file name on this case. Change-Id: Ic250d024e5feca739027c79a6e285d616234c4ea Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/android-clang/qmake.conf1
-rw-r--r--mkspecs/common/g++-win32.conf1
-rw-r--r--mkspecs/common/gcc-base.conf2
3 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf
index 5cc5a20f71..380a3ab60a 100644
--- a/mkspecs/android-clang/qmake.conf
+++ b/mkspecs/android-clang/qmake.conf
@@ -75,7 +75,6 @@ QMAKE_LFLAGS_RPATHLINK = -Wl,-rpath-link=
equals(QMAKE_HOST.os, Windows) {
QMAKE_LINK_OBJECT_MAX = 10
- QMAKE_LINK_OBJECT_SCRIPT = object_script
}
QMAKE_LIBS_X11 =
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index b198d69fd6..d4067f60b6 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -48,7 +48,6 @@ QMAKE_LFLAGS_DLL = -shared
QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
equals(QMAKE_HOST.os, Windows) {
QMAKE_LINK_OBJECT_MAX = 10
- QMAKE_LINK_OBJECT_SCRIPT = object_script
}
QMAKE_EXT_OBJ = .o
QMAKE_EXT_RES = _res.o
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 99d77156fd..9942089ed5 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -127,4 +127,6 @@ QMAKE_AR_LTCG = gcc-ar cqs
QMAKE_NM_LTCG = gcc-nm -P
QMAKE_RANLIB_LTCG = true # No need to run since gcc-ar has "s"
+QMAKE_LINK_OBJECT_SCRIPT = object_script
+
include(sanitize.conf)