summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac7
-rwxr-xr-xtool/darwin-cc1
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 56f6818dcf..3612288cbe 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 6eee96e435..8c96236603 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 "$@"