diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-11-29 11:34:04 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-11-29 11:34:04 +0000 |
| commit | 081432e434818a616a523f9f2bb18e707e4e68e3 (patch) | |
| tree | 66e473e317db4a0f1056c474b26fdefde6e6ec6e /classes/qmake-base.bbclass | |
| parent | 12bb4c41c375d36b596ba4eb0a9c8ce1d6ace10e (diff) | |
Introduce STAGING_BINDIR_CROSS and STAGING_BINDIR_NATIVE as discussed on the mailing list. There should be no functionality changes yet.
Diffstat (limited to 'classes/qmake-base.bbclass')
| -rw-r--r-- | classes/qmake-base.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass index 36ecfb622f..09694e97b8 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake-base.bbclass @@ -14,10 +14,10 @@ export OE_QMAKE_LDFLAGS="${LDFLAGS}" export OE_QMAKE_LINK="${CCLD}" export OE_QMAKE_AR="${AR}" export OE_QMAKE_STRIP="${STRIP}" -export OE_QMAKE_UIC="${STAGING_BINDIR}/uic" -export OE_QMAKE_MOC="${STAGING_BINDIR}/moc" +export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" +export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" export OE_QMAKE_RCC="non-existant" -export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake" +export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" export OE_QMAKE_RPATH="-Wl,-rpath-link," # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 |