purge -separate-debug-info=nocopy
clearly, this was a poor man's implementation of -force-debug-info. Change-Id: Ib5c7e390bd0e3a6912af8c4027074a114ed33f8a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
085a9f0822
commit
5915fb969f
7
configure
vendored
7
configure
vendored
@ -671,7 +671,6 @@ CFG_LARGEFILE=auto
|
|||||||
CFG_OPENSSL=auto
|
CFG_OPENSSL=auto
|
||||||
CFG_PRECOMPILE=auto
|
CFG_PRECOMPILE=auto
|
||||||
CFG_SEPARATE_DEBUG_INFO=no
|
CFG_SEPARATE_DEBUG_INFO=no
|
||||||
CFG_SEPARATE_DEBUG_INFO_NOCOPY=no
|
|
||||||
CFG_REDUCE_EXPORTS=auto
|
CFG_REDUCE_EXPORTS=auto
|
||||||
CFG_SSE2=auto
|
CFG_SSE2=auto
|
||||||
CFG_SSE3=auto
|
CFG_SSE3=auto
|
||||||
@ -1493,9 +1492,6 @@ while [ "$#" -gt 0 ]; do
|
|||||||
separate-debug-info)
|
separate-debug-info)
|
||||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||||
CFG_SEPARATE_DEBUG_INFO="$VAL"
|
CFG_SEPARATE_DEBUG_INFO="$VAL"
|
||||||
elif [ "$VAL" = "nocopy" ] ; then
|
|
||||||
CFG_SEPARATE_DEBUG_INFO="yes"
|
|
||||||
CFG_SEPARATE_DEBUG_INFO_NOCOPY="yes"
|
|
||||||
else
|
else
|
||||||
UNKNOWN_OPT=yes
|
UNKNOWN_OPT=yes
|
||||||
fi
|
fi
|
||||||
@ -5839,9 +5835,6 @@ if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
|
|||||||
QMakeVar add QMAKE_CXXFLAGS -g
|
QMakeVar add QMAKE_CXXFLAGS -g
|
||||||
QT_CONFIG="$QT_CONFIG separate_debug_info"
|
QT_CONFIG="$QT_CONFIG separate_debug_info"
|
||||||
fi
|
fi
|
||||||
if [ "$CFG_SEPARATE_DEBUG_INFO_NOCOPY" = "yes" ] ; then
|
|
||||||
QT_CONFIG="$QT_CONFIG separate_debug_info_nocopy"
|
|
||||||
fi
|
|
||||||
[ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
|
[ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
|
||||||
[ "$CFG_SSE3" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse3"
|
[ "$CFG_SSE3" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse3"
|
||||||
[ "$CFG_SSSE3" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG ssse3"
|
[ "$CFG_SSSE3" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG ssse3"
|
||||||
|
@ -19,7 +19,6 @@ contains(TEMPLATE, .*lib) {
|
|||||||
unix:contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions
|
unix:contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions
|
||||||
contains(QT_CONFIG, largefile): CONFIG += largefile
|
contains(QT_CONFIG, largefile): CONFIG += largefile
|
||||||
contains(QT_CONFIG, separate_debug_info): CONFIG += separate_debug_info
|
contains(QT_CONFIG, separate_debug_info): CONFIG += separate_debug_info
|
||||||
contains(QT_CONFIG, separate_debug_info_nocopy): CONFIG += separate_debug_info_nocopy
|
|
||||||
}
|
}
|
||||||
|
|
||||||
warnings_are_errors:warning_clean {
|
warnings_are_errors:warning_clean {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
!separate_debug_info_nocopy:have_target:!static:!isEmpty(QMAKE_OBJCOPY) {
|
have_target:!static:!isEmpty(QMAKE_OBJCOPY) {
|
||||||
qnx {
|
qnx {
|
||||||
debug_info_suffix = sym
|
debug_info_suffix = sym
|
||||||
debug_info_keep = --keep-file-symbols
|
debug_info_keep = --keep-file-symbols
|
||||||
|
Loading…
Reference in New Issue
Block a user