diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-04 21:33:58 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-05 09:56:49 +0200 |
| commit | 415917d7b990c76a2763c9beb16599e312b2211f (patch) | |
| tree | 1be944d816285f839ed72da8ef83da92f4411bad /rules/qt5.make | |
| parent | b7c00536d892f7d418e2e5ca63706de03dd87585 (diff) | |
| download | ptxdist-415917d7b990c76a2763c9beb16599e312b2211f.tar.gz ptxdist-415917d7b990c76a2763c9beb16599e312b2211f.tar.xz | |
qt5: give qmake the 'default' gcc options, so it can generate the correct gyp options
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/qt5.make')
| -rw-r--r-- | rules/qt5.make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/qt5.make b/rules/qt5.make index fc9164976..66fce1d39 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -202,7 +202,7 @@ ifndef PTXCONF_QT5_MODULE_QTWEBKIT_VIDEO QT5_QMAKE_OPT += "WEBKIT_CONFIG-=video use_gstreamer use_native_fullscreen_video glib" endif ifdef PTXCONF_QT5_MODULE_QTWEBENGINE -QT5_QMAKE_OPT += "GYP_CONFIG+=arm_float_abi=$(shell ptxd_cross_cc_v | sed -n "s/^COLLECT_GCC_OPTIONS=.*'-mfloat-abi=\([^']*\)'.*/\1/p" | tail -n1)" +QT5_QMAKE_OPT += "PTX_QMAKE_CFLAGS=$(shell ptxd_cross_cc_v | sed -n "s/^COLLECT_GCC_OPTIONS=\(.*\)/\1/p" | tail -n1)" endif $(STATEDIR)/qt5.prepare: |