diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 14:24:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-22 14:24:28 +0200 |
| commit | 2064bf6155fda203fe798166e40be9247a20da85 (patch) | |
| tree | 7b4166afcba07a471cd89bfbedc15e51edfeffdc /configure | |
| parent | 0127962e4772d6c758b954b2fe1d4b676d366b4c (diff) | |
| parent | 508b95899d4764d879a01b3990e44ce849cd9abc (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -3663,9 +3663,9 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "########################################################################" >> "$mkfile" EXTRA_OBJS= EXTRA_SRCS= - EXTRA_CFLAGS="\$(QMAKE_CFLAGS)" - EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)" - EXTRA_LFLAGS="\$(QMAKE_LFLAGS)" + EXTRA_CFLAGS="\$(QMAKE_CFLAGS) \$(QMAKE_CFLAGS_SPLIT_SECTIONS)" + EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)" + EXTRA_LFLAGS="\$(QMAKE_LFLAGS) \$(QMAKE_LFLAGS_GCSECTIONS)" if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then EXTRA_LFLAGS="$EXTRA_LFLAGS -lm" @@ -3675,8 +3675,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" setBootstrapVariable QMAKE_CFLAGS + setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS setBootstrapVariable QMAKE_CXXFLAGS + setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS setBootstrapVariable QMAKE_LFLAGS + setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then setBootstrapVariable QMAKE_CFLAGS_RELEASE |