From 04739ce4b401bdfe766e64deac1bb382ddd954cc Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 8 Jun 2020 14:16:55 +0300 Subject: 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 --- mkspecs/common/g++-win32.conf | 1 - mkspecs/common/gcc-base.conf | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs/common') 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) -- cgit v1.2.3