From c19661c97711740feca9594d9bd482d11209a123 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 30 Aug 2022 19:32:59 +0200 Subject: [PATCH] macdeploycheck: Fix check for libgcc --- ext/macdeploycheck/macdeploycheck.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ext/macdeploycheck/macdeploycheck.cpp b/ext/macdeploycheck/macdeploycheck.cpp index d2ecd7c48..beb9019ee 100644 --- a/ext/macdeploycheck/macdeploycheck.cpp +++ b/ext/macdeploycheck/macdeploycheck.cpp @@ -91,7 +91,7 @@ int main(int argc, char **argv) { qLog(Error) << "First line" << first_line << "does not match" << filepath; success = false; } - QRegularExpression regexp(QStringLiteral("^\\t(.+) \\(compatibility version (\\d+\\.\\d+\\.\\d+), current version (\\d+\\.\\d+\\.\\d+)(, weak)?\\)$")); + QRegularExpression regexp(QStringLiteral("^\\t(.+) \\(compatibility version (\\d+\\.\\d+\\.\\d+), current version (\\d+\\.\\d+\\.\\d+)(, weak|, reexport)?\\)$")); for (const QString &output_line : output_lines) { //qDebug() << "Final check on" << filepath << output_line; @@ -130,9 +130,6 @@ int main(int argc, char **argv) { else if (library.startsWith("/System/Library/") || library.startsWith("/usr/lib/")) { // System library continue; } - else if (library.endsWith("libgcc_s.1.dylib")) { // fftw points to it for some reason. - continue; - } else { qLog(Error) << "File" << filepath << "points to" << library; success = false;