From f8456b650bae8eef94acd80cb255a730177fe1ed Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 30 Oct 2023 21:19:44 +0900 Subject: [PATCH] Ignore duplicate libraries warnings from gcc 13 --- configure.ac | 7 +++++-- tool/darwin-cc | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 56f6818dcf0d1a..3612288cbed022 100644 --- a/configure.ac +++ b/configure.ac @@ -421,13 +421,16 @@ AC_SUBST(COUTFLAG) AC_SUBST(CSRCFLAG) AS_CASE(["$build_os"], - [darwin1*.*], [ + [darwin*], [ + # gcc 13 warns duplicate -l options, which are added by the + # default spec. # Xcode linker warns for deprecated architecture and wrongly # installed TBD files. CC_WRAPPER="" echo 'int main(void) {return 0;}' > conftest.c AS_IF([$CC -framework Foundation -o conftest conftest.c 2>&1 | - grep '^ld: warning: text-based stub file' >/dev/null], [ + grep -e '^ld: warning: ignoring duplicate libraries:' \ + -e '^ld: warning: text-based stub file' >/dev/null], [ CC_WRAPPER=`cd -P "${tooldir}" && pwd`/darwin-cc CC="$CC_WRAPPER $CC" ]) diff --git a/tool/darwin-cc b/tool/darwin-cc index 6eee96e4359130..8c962366032994 100755 --- a/tool/darwin-cc +++ b/tool/darwin-cc @@ -2,5 +2,6 @@ exec 2> >(exec grep -v \ -e '^ld: warning: The [a-z0-9_][a-z0-9_]* architecture is deprecated for macOS' \ -e '^ld: warning: text-based stub file /System/Library/Frameworks/' \ + -e '^ld: warning: ignoring duplicate libraries:' \ >&2) exec "$@"