diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-04-27 15:14:55 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-04-27 20:12:46 +0000 |
commit | fa93c7c7b05d0b41bb0d8c8f285925b27ec28cb4 (patch) | |
tree | 76d6cdfe8d64a11a0138dacd4127bcdff9e313d3 /configure | |
parent | 5795c86e8b84d9026c2c768e816d2aea620a7ec7 (diff) |
Fix a small logic error in qmake bootstrap compiler flags
There was a small logic error in the code selecting the debug/release
C(XX)_FLAGS used when compiling qmake, that could lead to us not
specifying any flags at all.
Change-Id: I5d3c44367d535a17570e3602029b84a02706d624
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4028,7 +4028,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; setBootstrapVariable QMAKE_CXXFLAGS_RELEASE EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)" - elif [ "$CFG_DEBUG" = "yes" ]; then + else setBootstrapVariable QMAKE_CFLAGS_DEBUG setBootstrapVariable QMAKE_CXXFLAGS_DEBUG EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)" |