On Wed, 2 Apr 2025, 14:53 Iain Sandoe, <iains....@gmail.com> wrote: > Tested on x86_64-darwin24 with Xcode 16.2. OK for trunk? >
OK, thanks thanks > Iain > > --- 8< --- > > Darwin's linker now warns when duplicate rpaths are presented - which > happens when we emit duplicate '-B' paths. In principle, we should avoid > this in the test- suite, however at present we tend to have duplicates > because different parts of the machinery add them. At some point, it might > be nice to have an "add_option_if_missing" and apply that across the whole > of the test infra. However this is not something for late in stage 4. So > the solution here is to prune the warning - the effect of the duplicate in > the libstdc++ testsuite is not important it will make the exes very > slightly > larger but it won't alter the paths that are presented for loading the > runtimes. > > libstdc++-v3/ChangeLog: > > * testsuite/lib/prune.exp: Prune XCode ld warning about duplicate > rpaths. > > Signed-off-by: Iain Sandoe <i...@sandoe.co.uk> > --- > libstdc++-v3/testsuite/lib/prune.exp | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/libstdc++-v3/testsuite/lib/prune.exp > b/libstdc++-v3/testsuite/lib/prune.exp > index 416e851614b..a9a29937e43 100644 > --- a/libstdc++-v3/testsuite/lib/prune.exp > +++ b/libstdc++-v3/testsuite/lib/prune.exp > @@ -77,6 +77,9 @@ proc libstdc++-dg-prune { system text } { > # Ignore harmless warnings from Xcode 4+. > regsub -all "(^|\n)\[^\n\]*ld: warning: could not create compact > unwind for\[^\n\]*" $text "" text > > + # Ignore duplicate path warnings from Xcode 16+. > + regsub -all "(^|\n)\[^\n\]*ld: warning: duplicate -rpath\[^\n\]*" > $text "" text > + > # Ignore dsymutil warning (tool bug is actually in the linker) > regsub -all "(^|\n)\[^\n\]*could not find object file symbol for > symbol\[^\n\]*" $text "" text > > -- > 2.39.2 (Apple Git-143) > >