diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-03-28 11:33:58 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-28 11:34:46 (GMT) |
| commit | 1dac22d30849f0dfb38f281c59afc886b1046bb3 (patch) | |
| tree | e1cc8eedb3926797234137ba57b0bd2ce1e7d5df | |
| parent | 818ef0c6c0202b5dffd0e8ab045f48687546d5dd (diff) | |
| download | Qt-1dac22d30849f0dfb38f281c59afc886b1046bb3.zip Qt-1dac22d30849f0dfb38f281c59afc886b1046bb3.tar.gz Qt-1dac22d30849f0dfb38f281c59afc886b1046bb3.tar.bz2 | |
fix -enable-stdcall-fixup usage
the leading "-Wl," was apparently accidentally split off to the wrong
line.
Originally done in 0953ee3 for mkspecs/win32-g++.
Merge-request: 1154
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | mkspecs/unsupported/win32-g++-cross/qmake.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf index 7e077a1..efc3de2 100644 --- a/mkspecs/unsupported/win32-g++-cross/qmake.conf +++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf @@ -52,8 +52,8 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< QMAKE_LINK = i686-pc-mingw32-g++ QMAKE_LINK_C = i686-pc-mingw32-gcc -QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl +QMAKE_LFLAGS = -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads QMAKE_LFLAGS_EXCEPTIONS_OFF = QMAKE_LFLAGS_RELEASE = -Wl,-s QMAKE_LFLAGS_DEBUG = |