diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-13 07:39:30 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-13 09:45:58 +0000 |
commit | eb3e3853c4de146410478fca652ea24f3943f774 (patch) | |
tree | df215a0379d5ce40c5c7725d1f00af982b280c03 /config.tests/unix/compile.test | |
parent | 33044b83c261c485faa0a6f367773138f9892f76 (diff) | |
parent | b94773c9c838a0b3db1bced0bc8daf5b04aefc29 (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'config.tests/unix/compile.test')
-rwxr-xr-x | config.tests/unix/compile.test | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index c8929a37f1..ab1bd00884 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -15,6 +15,7 @@ QTCONF=$9 shift 9 LFLAGS="$SYSROOT_FLAG" INCLUDEPATH="" +CFLAGS="$SYSROOT_FLAG" CXXFLAGS="$SYSROOT_FLAG" MAC_ARCH_CXXFLAGS="" MAC_ARCH_LFLAGS="" @@ -31,12 +32,14 @@ while [ "$#" -gt 0 ]; do shift ;; -arch) + MAC_ARCH_CFLAGS="$MAC_ARCH_CFLAGS -arch $2" MAC_ARCH_CXXFLAGS="$MAC_ARCH_CXXFLAGS -arch $2" MAC_ARCH_LFLAGS="$MAC_ARCH_LFLAGS -arch $2" shift ;; -F*|-m*|-x*) LFLAGS="$LFLAGS \"$PARAM\"" + CFLAGS="$CFLAGS \"$PARAM\"" CXXFLAGS="$CXXFLAGS \"$PARAM\"" ;; -L*|-l*|-pthread) @@ -47,10 +50,12 @@ while [ "$#" -gt 0 ]; do INCLUDEPATH="$INCLUDEPATH \"$INC\"" ;; -f*|-D*) + CFLAGS="$CFLAGS \"$PARAM\"" CXXFLAGS="$CXXFLAGS \"$PARAM\"" ;; -Qoption) # Two-argument form for the Sun Compiler + CFLAGS="$CFLAGS $PARAM \"$2\"" CXXFLAGS="$CXXFLAGS $PARAM \"$2\"" shift ;; @@ -72,7 +77,7 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 # Make sure output from possible previous tests is gone rm -f "$EXE" "${EXE}.exe" -set -- "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS+=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" $QMAKE_ARGS "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" +set -- "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS+=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CFLAGS*=$CFLAGS" "QMAKE_CFLAGS+=$MAC_ARCH_CFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" $QMAKE_ARGS "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes else |