[libmicrohttpd] branch master updated (d36dfd47 -> c3ea38eb)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from d36dfd47 configure: do not use '-Wreserved-macro-identifier'
     new cf26c7b4 configure: do not use -Og with Clang when ASAN enabled
     new c3ea38eb configure: do not use -Wno-reserved-macro-identifier

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index cac74b51..170c9aaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,32 @@ AS_CASE([${enable_build_type}],[debug|debugger],
   [ # Debug build or build for walking with debugger
     CFLAGS="${user_CFLAGS}"
     AS_VAR_IF([enable_build_type],["debug"],
-      [MHD_FIND_ADD_CC_CFLAG([CFLAGS_ac], [-Og], [-O0])],
+      [
+        AS_IF([test "x${enable_sanitizers}" != "xno"],
+          [
+            AC_CACHE_CHECK([whether workarounds for clang are required],
+              [mhd_cv_cc_clang_based],
+              [
+                AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+#if ! defined(__clang__) && ! defined(__llvm__)
+#error Compiler is not clang-based
+choke me now
+#endif
+                      ]]
+                    )
+                  ],
+                  [mhd_cv_cc_clang_based="yes"],[mhd_cv_cc_clang_based="no"]
+                )
+              ]
+            )
+          ]
+        )
+        # Clang has ASAN (pointer compare) broken when '-Og' optimisations are 
used
+        AS_IF([test "x${enable_sanitizers}" != "xno" && test 
"x${mhd_cv_cc_clang_based}" = "xyes"],
+          [MHD_CHECK_ADD_CC_CFLAG([-O0], [CFLAGS_ac])],
+          [MHD_FIND_ADD_CC_CFLAG([CFLAGS_ac], [-Og], [-O0])]
+        )
+      ],
       [MHD_CHECK_ADD_CC_CFLAG([-O0], [CFLAGS_ac])]
     )
     MHD_FIND_ADD_CC_CFLAG([CFLAGS_ac], [-ggdb3], [-g3], [-ggdb], [-g])
@@ -247,12 +272,6 @@ AS_CASE([${enable_build_type}],[release|release-*],
     LDFLAGS="${LDFLAGS_ac} ${user_LDFLAGS}"
   ]
 )
-AS_VAR_IF([enable_build_type],["neutral"],[],
-  [ # Any non-neutral build types, final additional flags
-    CFLAGS="${user_CFLAGS}"
-    MHD_CHECK_ADD_CC_CFLAGS([-Wno-reserved-macro-identifier], [CFLAGS_ac])
-  ]
-)
 CFLAGS="${CFLAGS_ac} ${user_CFLAGS}"
 # Additional flags are checked and added at the end of 'configure'
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.