1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename MAC_CONFIG_TEST_COMMANDLINE to MAC_SDK_FLAG

Browse Source 
The Mac OS X SDK is the only thing that variable is
used for, so give it a name that better fits its use.

Change-Id: Ifd9866bc19edda0e9f0bcb17270eb26a8849401e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Danny Boelens 2012-07-24 17:05:08 +02:00 committed by Qt by Nokia
parent a2f705029c
commit 64a8c78538
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -841,7 +841,6 @@ CFG_GETIFADDRS=auto
CFG_INOTIFY=auto CFG_INOTIFY=auto
CFG_RPATH=yes CFG_RPATH=yes
CFG_FRAMEWORK=auto CFG_FRAMEWORK=auto
MAC_CONFIG_TEST_COMMANDLINE= # used to make the configure tests run with the correct arch's and SDK settings
CFG_MAC_HARFBUZZ=no CFG_MAC_HARFBUZZ=no
CFG_PREFIX_INSTALL=yes CFG_PREFIX_INSTALL=yes
CFG_SDK= CFG_SDK=
@ -2567,9 +2566,11 @@ if [ "$CFG_FORCEDEBUGINFO" = "yes" ]; then
QT_CONFIG="$QT_CONFIG force_debug_info" QT_CONFIG="$QT_CONFIG force_debug_info"
fi fi
# pass on $CFG_SDK to the configure tests. # pass on $CFG_SDK to the arch/configure tests.
if [ '!' -z "$CFG_SDK" ]; then if [ -n "$CFG_SDK" ]; then
MAC_CONFIG_TEST_COMMANDLINE="$MAC_CONFIG_TEST_COMMANDLINE -sdk $CFG_SDK" MAC_SDK_FLAG="-sdk $CFG_SDK"
else
MAC_SDK_FLAG=
fi fi
# find the default framework value # find the default framework value
@ -3796,7 +3797,7 @@ compileTest()
path=config.tests/$1 path=config.tests/$1
name=$2 name=$2
shift 2 shift 2
"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS $MAC_CONFIG_TEST_COMMANDLINE "$@" "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS $MAC_SDK_FLAG "$@"
} }
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -3805,7 +3806,7 @@ compileTest()
# Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is
OUTFILE=$outpath/arch.result OUTFILE=$outpath/arch.result
"$unixtests/arch.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "$OUTFILE" "CFG" $MAC_CONFIG_TEST_COMMANDLINE "$unixtests/arch.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "$OUTFILE" "CFG" $MAC_SDK_FLAG
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
eval `cat "$OUTFILE"` eval `cat "$OUTFILE"`
else else
@ -3818,7 +3819,7 @@ rm -f "$OUTFILE" 2>/dev/null
if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then
# Do the same test again, using the host compiler # Do the same test again, using the host compiler
SYSROOT_FLAG= "$unixtests/arch.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "$OUTFILE" "CFG_HOST" $MAC_CONFIG_TEST_COMMANDLINE SYSROOT_FLAG= "$unixtests/arch.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "$OUTFILE" "CFG_HOST" $MAC_SDK_FLAG
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
eval `cat "$OUTFILE"` eval `cat "$OUTFILE"`
else else