mirror of
https://git.yoctoproject.org/poky
synced 2026-02-24 18:39:40 +01:00
b7daba6738
Drop backported patches which are already present in 2.36 release (From OE-Core rev: 897afa95ba340f1124decac5753e1d1e1283b515) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 805e3ce0c20bee5049ff167ab6f620a230c6db51 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Wed, 15 Apr 2020 14:17:20 -0700
|
|
Subject: [PATCH] Check for clang before checking gcc version
|
|
|
|
Clang advertises itself to be gcc 4.2.1, so when compiling this test
|
|
here fails since gcc < 4.4.5 did not support -static-libstdc++ but thats
|
|
not true for clang, so its better to make an additional check for clang
|
|
before resorting to gcc version check. This should let clang enable
|
|
static libstdc++ linking
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
configure | 2 +-
|
|
configure.ac | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 7b369071141..7da69e27ce9 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -5093,7 +5093,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
-#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
|
|
+#if !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5))
|
|
#error -static-libstdc++ not implemented
|
|
#endif
|
|
int main() {}
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 92f01fb3ed7..e99d67ab86b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1311,7 +1311,7 @@ if test "$GCC" = yes; then
|
|
AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
|
|
AC_LANG_PUSH(C++)
|
|
AC_LINK_IFELSE([AC_LANG_SOURCE([
|
|
-#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
|
|
+#if !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5))
|
|
#error -static-libstdc++ not implemented
|
|
#endif
|
|
int main() {}])],
|