1From 8942cfa25f5822d88f990c3a939c0a4f7832a0e2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Apr 2020 14:17:20 -0700
4Subject: [PATCH] Check for clang before checking gcc version
5
6Clang advertises itself to be gcc 4.2.1, so when compiling this test
7here fails since gcc < 4.4.5 did not support -static-libstdc++ but thats
8not true for clang, so its better to make an additional check for clang
9before resorting to gcc version check. This should let clang enable
10static libstdc++ linking
11
12Upstream-Status: Pending
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 configure    | 2 +-
17 configure.ac | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/configure b/configure
21index bbfb5979546..fef4bd65124 100755
22--- a/configure
23+++ b/configure
24@@ -5446,7 +5446,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
25 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
26 /* end confdefs.h.  */
27
28-#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
29+#if !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5))
30 #error -static-libstdc++ not implemented
31 #endif
32 int main() {}
33diff --git a/configure.ac b/configure.ac
34index f9694cdf901..54a3a968307 100644
35--- a/configure.ac
36+++ b/configure.ac
37@@ -1419,7 +1419,7 @@ if test "$GCC" = yes; then
38   AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
39   AC_LANG_PUSH(C++)
40   AC_LINK_IFELSE([AC_LANG_SOURCE([
41-#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
42+#if !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5))
43 #error -static-libstdc++ not implemented
44 #endif
45 int main() {}])],
46