diff options
| author | Holger Schroeder <holger.schroeder.ext@basyskom.de> | 2010-07-27 19:10:28 +0200 |
|---|---|---|
| committer | Sergiy Dubovik <sergiy.dubovik@nokia.com> | 2010-07-28 10:39:33 +0300 |
| commit | 7715f5ad7f697f587eebd62380d88ee9a3f111ad (patch) | |
| tree | 1855489b60299246284ea14c27a547f5e4f165dd /mkspecs/features | |
| parent | a8b3fdf1d9effbce326d84f2209d09f41ba51052 (diff) | |
Fixes: NB#178646 - mmoc.pl should be used in armel targets
RevBy: Max
Details: The IS_ARMEL define is only defined when building
libmeegotouch itself. Now we get the target architecture from
uname -m
and use it instead. Tested on sbox x86 and arm for maemo5 and
maemo6. Works for me.
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/meegotouch_mmoc.prf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/meegotouch_mmoc.prf b/mkspecs/features/meegotouch_mmoc.prf index f13ebb93..b984464b 100644 --- a/mkspecs/features/meegotouch_mmoc.prf +++ b/mkspecs/features/meegotouch_mmoc.prf @@ -22,7 +22,11 @@ contains(DEFINES, BUILD_M) { win32 { M_MMOC_EXECUTABLE = perl.exe $$M_SOURCE_TREE/mmoc/mmoc.pl } else { - contains(DEFINES, IS_ARMEL) { + isEmpty( MEEGO_ARCH ) { + MEEGO_ARCH = $$system( uname -m ) + } + + contains(MEEGO_ARCH, arm) { M_MMOC_EXECUTABLE = mmoc.pl } else { M_MMOC_EXECUTABLE = mmoc |