diff options
Diffstat (limited to 'config.tests/mac')
| -rwxr-xr-x | config.tests/mac/crc.test | 14 | ||||
| -rwxr-xr-x | config.tests/mac/dwarf2.test | 26 |
2 files changed, 36 insertions, 4 deletions
diff --git a/config.tests/mac/crc.test b/config.tests/mac/crc.test index 9cbe7bad94..527b02f7d8 100755 --- a/config.tests/mac/crc.test +++ b/config.tests/mac/crc.test @@ -14,6 +14,8 @@ shift 7 LFLAGS="" INCLUDEPATH="" CXXFLAGS="" +MAC_CXXFLAGS="" +MAC_LFLAGS="" while [ "$#" -gt 0 ]; do PARAM=$1 case $PARAM in @@ -21,6 +23,16 @@ while [ "$#" -gt 0 ]; do LFLAGS="$LFLAGS -framework \"$2\"" shift ;; + -arch) + MAC_CXXFLAGS="$MAC_CXXFLAGS -arch $2" + MAC_LFLAGS="$MAC_LFLAGS -arch $2" + shift + ;; + -sdk) + MAC_CXXFLAGS="$MAC_CXXFLAGS -isysroot $2" + MAC_LFLAGS="$MAC_LFLAGS -Wl,-syslibroot,$2" + shift + ;; -F*|-m*|-x*) LFLAGS="$LFLAGS $PARAM" CXXFLAGS="$CXXFLAGS $PARAM" @@ -53,7 +65,7 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST" cd "$OUTDIR/$TEST" $MAKE distclean >/dev/null 2>&1 -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" +"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then $MAKE diff --git a/config.tests/mac/dwarf2.test b/config.tests/mac/dwarf2.test index a640b113de..b58a1a09f8 100755 --- a/config.tests/mac/dwarf2.test +++ b/config.tests/mac/dwarf2.test @@ -6,10 +6,30 @@ COMPILER=$1 VERBOSE=$2 WORKDIR=$3 +shift 3 + +LFLAGS= +CXXFLAGS= +while [ "$#" -gt 0 ]; do + case $1 in + -arch) + CXXFLAGS="$CXXFLAGS -arch $2" + shift + ;; + -sdk) + CXXFLAGS="$CXXFLAGS -isysroot $2" + LFLAGS="$LFLAGS -Wl,-syslibroot,$2" + shift + ;; + *) ;; + esac + shift +done + touch dwarf2.c -if "$COMPILER" -c dwarf2.c -Werror -gdwarf-2 2>/dev/null 1>&2; then - if "$COMPILER" -c dwarf2.c -Werror -gdwarf-2 2>&1 | grep "unsupported" >/dev/null ; then +if "$COMPILER" -c dwarf2.c $CXXFLAGS -Werror -gdwarf-2 2>/dev/null 1>&2; then + if "$COMPILER" -c dwarf2.c $CXXFLAGS -Werror -gdwarf-2 2>&1 | grep "unsupported" >/dev/null ; then true else DWARF2_SUPPORT=yes @@ -18,7 +38,7 @@ fi rm -f dwarf2.c dwarf2.o # Test for xcode 2.4.0, which has a broken implementation of DWARF -"$COMPILER" $WORKDIR/xcodeversion.cpp -o xcodeversion -framework Carbon; +"$COMPILER" $WORKDIR/xcodeversion.cpp $CXXFLAGS $LFLAGS -o xcodeversion -framework Carbon; ./xcodeversion if [ "$?" == "1" ]; then |