diff options
author | axis <qt-info@nokia.com> | 2010-08-04 08:53:31 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-08-04 09:42:32 (GMT) |
commit | d444ca3cbc4fc3a923e67755d62d52bd5186f2f0 (patch) | |
tree | d869da4d4b067d25232fce67385c28648c6301eb | |
parent | 4eaf761eba1ed0e9980ce5758a40c17e41510ee2 (diff) | |
download | Qt-d444ca3cbc4fc3a923e67755d62d52bd5186f2f0.zip Qt-d444ca3cbc4fc3a923e67755d62d52bd5186f2f0.tar.gz Qt-d444ca3cbc4fc3a923e67755d62d52bd5186f2f0.tar.bz2 |
Skipped rcomp check on Raptor.
This is necessary in the case where Qt is built as part of the
platform, where configure will run before all the tools are built.
RevBy: Thomas Zander
-rwxr-xr-x | configure | 31 |
1 files changed, 16 insertions, 15 deletions
@@ -4849,23 +4849,24 @@ case "$XPLATFORM" in *symbian*) exit 1 fi - # the main commands needed to compile; - (cd config.tests/symbian - mkdir -p rcomp - cd rcomp - rm -f rcomp_test.rsg - touch rcomp_test.rpp rcomp_test.rsc rcomp_test.rss - rcomp -u -m045,046,047 -s./rcomp_test.rpp -o./rcomp_test.rsc -h./rcomp_test.rsg -i./rcomp_test.rss 2>&1 > /dev/null - if test ! -f rcomp_test.rsg; then - echo "Finding a working rcomp in your PATH failed." - echo "Fatal error. Make sure you have the epoc tools working and in your PATH"; - exit 1; - fi - ) - - # compile a simple main that uses printf if ! echo $XPLATFORM | grep symbian-sbsv2 > /dev/null; then # Raptor does not support configure tests. + + # the main commands needed to compile; + (cd config.tests/symbian + mkdir -p rcomp + cd rcomp + rm -f rcomp_test.rsg + touch rcomp_test.rpp rcomp_test.rsc rcomp_test.rss + rcomp -u -m045,046,047 -s./rcomp_test.rpp -o./rcomp_test.rsc -h./rcomp_test.rsg -i./rcomp_test.rss 2>&1 > /dev/null + if test ! -f rcomp_test.rsg; then + echo "Finding a working rcomp in your PATH failed." + echo "Fatal error. Make sure you have the epoc tools working and in your PATH"; + exit 1; + fi + ) + + # compile a simple main that uses printf if ! "$symbiantests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/symbian/simple "simple" $L_FLAGS $I_FLAGS $l_FLAGS then echo "Testing your compiler failed. Could not compile a simple application." |