| |
@@ -1,18 +1,41 @@
|
| |
- From 6710648c2b270c9ce68a7d9f1bba1222c7be8b58 Mon Sep 17 00:00:00 2001
|
| |
+ From 3602ee9dcc74683f91fe4f9ca228aa17a6474403 Mon Sep 17 00:00:00 2001
|
| |
From: Kamil Dudka <kdudka@redhat.com>
|
| |
Date: Wed, 31 Oct 2012 11:38:30 +0100
|
| |
- Subject: [PATCH] prevent configure script from discarding -g in CFLAGS (#496778)
|
| |
+ Subject: [PATCH] prevent configure script from discarding -g in CFLAGS
|
| |
+ (#496778)
|
| |
|
| |
---
|
| |
- configure | 13 +++----------
|
| |
- m4/curl-compilers.m4 | 13 +++----------
|
| |
- 2 files changed, 6 insertions(+), 20 deletions(-)
|
| |
+ configure | 26 ++++++--------------------
|
| |
+ m4/curl-compilers.m4 | 26 ++++++--------------------
|
| |
+ 2 files changed, 12 insertions(+), 40 deletions(-)
|
| |
|
| |
diff --git a/configure b/configure
|
| |
- index 8f079a3..53b4774 100755
|
| |
+ index d6d125f49..3eba7b15f 100755
|
| |
--- a/configure
|
| |
+++ b/configure
|
| |
- @@ -16343,18 +16343,11 @@ $as_echo "yes" >&6; }
|
| |
+ @@ -16269,18 +16269,11 @@ $as_echo "no" >&6; }
|
| |
+ clangvhi=`echo $clangver | cut -d . -f1`
|
| |
+ clangvlo=`echo $clangver | cut -d . -f2`
|
| |
+ compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 2>/dev/null`
|
| |
+ - flags_dbg_all="-g -g0 -g1 -g2 -g3"
|
| |
+ - flags_dbg_all="$flags_dbg_all -ggdb"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gstabs"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gstabs+"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gcoff"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gxcoff"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gdwarf-2"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gvms"
|
| |
+ + flags_dbg_all=""
|
| |
+ flags_dbg_yes="-g"
|
| |
+ flags_dbg_off=""
|
| |
+ - flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
|
| |
+ - flags_opt_yes="-Os"
|
| |
+ + flags_opt_all=""
|
| |
+ + flags_opt_yes=""
|
| |
+ flags_opt_off="-O0"
|
| |
+ else
|
| |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| |
+ @@ -16343,18 +16336,11 @@ $as_echo "yes" >&6; }
|
| |
gccvhi=`echo $gccver | cut -d . -f1`
|
| |
gccvlo=`echo $gccver | cut -d . -f2`
|
| |
compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
|
| |
@@ -35,10 +58,32 @@
|
| |
|
| |
OLDCPPFLAGS=$CPPFLAGS
|
| |
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
|
| |
- index 0cbba7a..9175b5b 100644
|
| |
+ index c64db4bc6..d115a4aed 100644
|
| |
--- a/m4/curl-compilers.m4
|
| |
+++ b/m4/curl-compilers.m4
|
| |
- @@ -166,18 +166,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
|
| |
+ @@ -106,18 +106,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_CLANG], [
|
| |
+ clangvhi=`echo $clangver | cut -d . -f1`
|
| |
+ clangvlo=`echo $clangver | cut -d . -f2`
|
| |
+ compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 2>/dev/null`
|
| |
+ - flags_dbg_all="-g -g0 -g1 -g2 -g3"
|
| |
+ - flags_dbg_all="$flags_dbg_all -ggdb"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gstabs"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gstabs+"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gcoff"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gxcoff"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gdwarf-2"
|
| |
+ - flags_dbg_all="$flags_dbg_all -gvms"
|
| |
+ + flags_dbg_all=""
|
| |
+ flags_dbg_yes="-g"
|
| |
+ flags_dbg_off=""
|
| |
+ - flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
|
| |
+ - flags_opt_yes="-Os"
|
| |
+ + flags_opt_all=""
|
| |
+ + flags_opt_yes=""
|
| |
+ flags_opt_off="-O0"
|
| |
+ else
|
| |
+ AC_MSG_RESULT([no])
|
| |
+ @@ -166,18 +159,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
|
| |
gccvhi=`echo $gccver | cut -d . -f1`
|
| |
gccvlo=`echo $gccver | cut -d . -f2`
|
| |
compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
|
| |
