Disable ELF interpreter check when cross-compiling
authorHarald Fernengel <harald.fernengel@nokia.com>
Tue, 13 Sep 2011 10:15:22 +0000 (12:15 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 14 Oct 2011 19:21:28 +0000 (21:21 +0200)
It's not a good idea to look at the host's /bin/ls when cross-compiling

Change-Id: I1fe67b17abd92f01c1d89146227c5419eaa3242f
Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
src/corelib/global/global.pri

index 68582bf..b24c68a 100644 (file)
@@ -19,7 +19,7 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
 # Only used on platforms with CONFIG += precompile_header
 PRECOMPILED_HEADER = global/qt_pch.h
 
-linux*:!static:!symbian-gcce:!*-armcc* {
+linux*:!cross_compile:!static:!symbian-gcce:!*-armcc* {
    QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate
    prog=$$quote(if (/program interpreter: (.*)]/) { print $1; })
    DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\"