Skip to content

Commit

Permalink
Qmake: Share QMAKE_LINK_OBJECT_SCRIPT definition
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
orgads committed Jul 6, 2020
1 parent de307a8 commit 04739ce
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion mkspecs/android-clang/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
1 change: 0 additions & 1 deletion mkspecs/common/g++-win32.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions mkspecs/common/gcc-base.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 04739ce

Please sign in to comment.