fix all "qt style yes options" which start with -l
7de9d3709
broke them, because suddenly every -l* switch was parsed as a library. fix this by re-arranging how the options are parsed. this obsoletesd7ab351cdd
as well, by being more generic. fwiw, this syntax is stupid to start with, because all unknown -l* options are implicitly libraries and create confusing configure failures. emulating the compiler/linker command lines isn't such a great idea ... Task-number: QTBUG-29174 Change-Id: I11bac7a6f458664dff8cbe57ed9cd33a08d5e9ec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
ec145129c3
commit
1b69786a3f
34
configure
vendored
34
configure
vendored
@ -1110,18 +1110,10 @@ while [ "$#" -gt 0 ]; do
|
|||||||
VAL=`echo $1 | sed 's,-R,,'`
|
VAL=`echo $1 | sed 's,-R,,'`
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
-largefile)
|
-l) # -lfoo is handled differently
|
||||||
VAR="largefile"
|
|
||||||
VAL="yes"
|
|
||||||
;;
|
|
||||||
-l?*|-l)
|
|
||||||
VAR="add_link"
|
VAR="add_link"
|
||||||
if [ "$1" = "-l" ]; then
|
shift
|
||||||
shift
|
VAL="$1"
|
||||||
VAL="$1"
|
|
||||||
else
|
|
||||||
VAL=`echo $1 | sed 's,-l,,'`
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
-F?*|-F)
|
-F?*|-F)
|
||||||
VAR="add_fpath"
|
VAR="add_fpath"
|
||||||
@ -1132,14 +1124,10 @@ while [ "$#" -gt 0 ]; do
|
|||||||
VAL=`echo $1 | sed 's,-F,,'`
|
VAL=`echo $1 | sed 's,-F,,'`
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
-fw?*|-fw)
|
-fw) # -fwfoo is handled differently
|
||||||
VAR="add_framework"
|
VAR="add_framework"
|
||||||
if [ "$1" = "-fw" ]; then
|
shift
|
||||||
shift
|
VAL="$1"
|
||||||
VAL="$1"
|
|
||||||
else
|
|
||||||
VAL=`echo $1 | sed 's,-fw,,'`
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
-W*)
|
-W*)
|
||||||
VAR="add_warn"
|
VAR="add_warn"
|
||||||
@ -2130,6 +2118,16 @@ while [ "$#" -gt 0 ]; do
|
|||||||
UNKNOWN_OPT=yes
|
UNKNOWN_OPT=yes
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
l*) # -lfoo
|
||||||
|
L_FLAGS="$L_FLAGS -l\"${VAR#l}\""
|
||||||
|
;;
|
||||||
|
fw*) # -fwfoo
|
||||||
|
if [ "$BUILD_ON_MAC" = "yes" ]; then
|
||||||
|
L_FLAGS="$L_FLAGS -framework \"${VAR#fw}\""
|
||||||
|
else
|
||||||
|
UNKNOWN_OPT=yes
|
||||||
|
fi
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
UNKNOWN_OPT=yes
|
UNKNOWN_OPT=yes
|
||||||
;;
|
;;
|
||||||
|
Loading…
Reference in New Issue
Block a user