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

Make configure understand -W* arguments

Browse Source 
These will be passed on as extra C*FLAGS to the Qt build. Useful for
adding -Werror or -Wno-something-or-other.

Change-Id: Ifbbf63261573edd024de951082d99658eb443a3f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Bradley T. Hughes 2011-10-24 13:00:49 +02:00 committed by Qt by Nokia
parent 104f8671ff
commit f43eaaa5fa
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -815,6 +815,7 @@ I_FLAGS=
L_FLAGS= L_FLAGS=
RPATH_FLAGS= RPATH_FLAGS=
l_FLAGS= l_FLAGS=
W_FLAGS=
QCONFIG_FLAGS= QCONFIG_FLAGS=
XPLATFORM= # This seems to be the QMAKESPEC, like "linux-g++" or "symbian-gcce" XPLATFORM= # This seems to be the QMAKESPEC, like "linux-g++" or "symbian-gcce"
XPLATFORM_MINGW=no # Whether target platform is MinGW (win32-g++*) XPLATFORM_MINGW=no # Whether target platform is MinGW (win32-g++*)
@ -1230,6 +1231,10 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $1 | sed 's,-fw,,'` VAL=`echo $1 | sed 's,-fw,,'`
fi fi
;; ;;
-W*)
VAR="add_warn"
VAL="$1"
;;
-*) -*)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL="unknown" VAL="unknown"
@ -2383,6 +2388,9 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes UNKNOWN_OPT=yes
fi fi
;; ;;
add_warn)
W_FLAGS="$W_FLAGS \"${VAL}\""
;;
silent) silent)
CFG_SILENT="$VAL" CFG_SILENT="$VAL"
;; ;;
@ -7400,6 +7408,13 @@ if [ '!' -z "$I_FLAGS" ]; then
QMakeVar add QMAKE_CXXFLAGS "$I_FLAGS" QMakeVar add QMAKE_CXXFLAGS "$I_FLAGS"
fi fi
if [ '!' -z "$W_FLAGS" ]; then
# add the user defined warning flags
QMakeVar add QMAKE_CFLAGS "$W_FLAGS"
QMakeVar add QMAKE_CXXFLAGS "$W_FLAGS"
QMakeVar add QMAKE_OBJECTIVE_CFLAGS "$W_FLAGS"
fi
# turn off exceptions for the compilers that support it # turn off exceptions for the compilers that support it
if [ "$PLATFORM_QWS" = "yes" ]; then if [ "$PLATFORM_QWS" = "yes" ]; then
COMPILER=`echo $XPLATFORM | cut -f 3- -d-` COMPILER=`echo $XPLATFORM | cut -f 3- -d-`